github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-04 07:46:23 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Subcategories should show pills

Browse Source
This commit is contained in:
Robin Ward 2016-02-26 15:18:52 -05:00
parent c9cb5a5b79
commit 416e461417
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/bread-crumbs.js.es6
View File

@ -35,7 +35,7 @@ export default Ember.Component.extend({
}); });
}.property('firstCategory', 'hideSubcategories'), }.property('firstCategory', 'hideSubcategories'),
render: function(buffer) { render(buffer) {
if (this.get('hidden')) { return; } if (this.get('hidden')) { return; }
this._super(buffer); this._super(buffer);
} }

1
app/assets/javascripts/discourse/controllers/navigation/category.js.es6
View File

@ -9,7 +9,6 @@ export default NavigationDefaultController.extend({
@computed("showingSubcategoryList", "category", "noSubcategories") @computed("showingSubcategoryList", "category", "noSubcategories")
navItems(showingSubcategoryList, category, noSubcategories) { navItems(showingSubcategoryList, category, noSubcategories) {
if (showingSubcategoryList) { return []; }
return Discourse.NavItem.buildList(category, { noSubcategories }); return Discourse.NavItem.buildList(category, { noSubcategories });
} }
}); });

1
app/assets/javascripts/discourse/templates/navigation/category.hbs
View File

@ -3,7 +3,6 @@
noSubcategories=noSubcategories noSubcategories=noSubcategories
hideSubcategories=showingSubcategoryList}} hideSubcategories=showingSubcategoryList}}
{{navigation-bar navItems=navItems filterMode=filterMode}} {{navigation-bar navItems=navItems filterMode=filterMode}}
{{#if currentUser}} {{#if currentUser}}