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: do not show #uncategorized in category drop if setting is disabled (#6856)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-01-09 02:44:24 +01:00 committed by Guo Xiang Tan
parent 6e7b383ed6
commit 25269a37aa
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/select-kit/components/category-drop.js.es6
View File

@ -159,6 +159,16 @@ export default ComboBoxComponent.extend({
}
let results = Discourse.Category.search(filter);
if (!this.siteSettings.allow_uncategorized_topics) {
results = results.filter(result => {
return (
result.id !==
Discourse.Site.currentProp("uncategorized_category_id")
);
});
}
results = results.sort((a, b) => {
if (a.parent_category_id && !b.parent_category_id) {
return 1;