Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-12 22:34:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Regression with Categories nav item (#17885)

Browse Source
This commit is contained in:
Penar Musaraj 2022-08-12 11:30:39 -04:00 committed by GitHub
parent 4b70594173
commit 2c5ab47204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/controllers/navigation/default.js
View File

@ -10,6 +10,6 @@ export default Controller.extend(FilterModeMixin, {
@discourseComputed("router.currentRoute.queryParams.f") @discourseComputed("router.currentRoute.queryParams.f")
skipCategoriesNavItem(filterParamValue) { skipCategoriesNavItem(filterParamValue) {
return !filterParamValue || filterParamValue !== TRACKED_QUERY_PARAM_VALUE; return filterParamValue === TRACKED_QUERY_PARAM_VALUE;
}, },
}); });

2
app/assets/javascripts/discourse/app/models/nav-item.js
View File

@ -262,7 +262,7 @@ NavItem.reopenClass({
} }
if ( if (
(category || !args.skipCategoriesNavItem) && (category || args.skipCategoriesNavItem) &&
i.name.startsWith("categor") i.name.startsWith("categor")
) { ) {
return false; return false;

7
app/assets/javascripts/discourse/tests/acceptance/topic-discovery-tracked-test.js
View File

@ -69,6 +69,13 @@ acceptance("Topic Discovery Tracked", function (needs) {
"the categories nav item is displayed when tracked filter is not present" "the categories nav item is displayed when tracked filter is not present"
); );
await visit("/categories");
assert.ok(
exists("#navigation-bar li.categories"),
"the categories nav item is displayed on categories route when tracked filter is not present"
);
await visit("/?f=tracked"); await visit("/?f=tracked");
assert.ok( assert.ok(