Merge pull request #4387 from gdpelican/feature/tags-intersection
FEATURE: Tags intersection page
This commit is contained in:
@@ -43,6 +43,7 @@ export default Ember.Controller.extend(BulkTopicSelection, {
|
||||
needs: ["application"],
|
||||
|
||||
tag: null,
|
||||
additionalTags: null,
|
||||
list: null,
|
||||
canAdminTag: Ember.computed.alias("currentUser.staff"),
|
||||
filterMode: null,
|
||||
@@ -72,8 +73,8 @@ export default Ember.Controller.extend(BulkTopicSelection, {
|
||||
}.property(),
|
||||
|
||||
showAdminControls: function() {
|
||||
return this.get('canAdminTag') && !this.get('category');
|
||||
}.property('canAdminTag', 'category'),
|
||||
return this.get('additionalTags') && this.get('canAdminTag') && !this.get('category');
|
||||
}.property('additionalTags', 'canAdminTag', 'category'),
|
||||
|
||||
loadMoreTopics() {
|
||||
return this.get("list").loadMore();
|
||||
|
||||
Reference in New Issue
Block a user