IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Hide Uncategorized in site menu when disabled. (#7509)

Browse Source
This commit is contained in:
Dan Ungureanu 2019-05-09 14:08:10 +03:00 committed by GitHub
parent 4e91839c97
commit c06b00a54e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6
View File

@ -204,6 +204,12 @@ export default createWidget("hamburger-menu", {
); );
} }
if (!this.siteSettings.allow_uncategorized_topics) {
categories = categories.filter(
c => c.id !== this.site.uncategorized_category_id
);
}
const moreCount = categories.length - maxCategoriesToDisplay; const moreCount = categories.length - maxCategoriesToDisplay;
categories = categories.slice(0, maxCategoriesToDisplay); categories = categories.slice(0, maxCategoriesToDisplay);

35
test/javascripts/widgets/hamburger-menu-test.js.es6
View File

@ -125,19 +125,38 @@ widgetTest("top categories - anonymous", {
beforeEach() { beforeEach() {
this.siteSettings.header_dropdown_category_count = 8; this.siteSettings.header_dropdown_category_count = 8;
maxCategoriesToDisplay = this.siteSettings.header_dropdown_category_count;
categoriesByCount = this.site.get("categoriesByCount");
}, },
test(assert) { test(assert) {
const count = categoriesByCount.length; assert.equal(find(".category-link").length, 8);
const maximum =
count <= maxCategoriesToDisplay ? count : maxCategoriesToDisplay;
assert.equal(find(".category-link").length, maximum);
assert.equal( assert.equal(
find(".category-link .category-name").text(), find(".category-link .category-name").text(),
categoriesByCount this.site
.slice(0, maxCategoriesToDisplay) .get("categoriesByCount")
.slice(0, 8)
.map(c => c.name)
.join("")
);
}
});
widgetTest("top categories - allow_uncategorized_topics", {
template: '{{mount-widget widget="hamburger-menu"}}',
anonymous: true,
beforeEach() {
this.siteSettings.allow_uncategorized_topics = false;
this.siteSettings.header_dropdown_category_count = 8;
},
test(assert) {
assert.equal(find(".category-link").length, 8);
assert.equal(
find(".category-link .category-name").text(),
this.site
.get("categoriesByCount")
.filter(c => c.name !== "uncategorized")
.slice(0, 8)
.map(c => c.name) .map(c => c.name)
.join("") .join("")
); );