Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "FIX: Show Uncategorized in category-chooser (#25794)" (#25843) 

This reverts commit 1df473b530.
This commit is contained in:
Penar Musaraj 2024-02-23 12:21:44 -05:00 committed by GitHub
parent b205abadfc
commit d10b1aaedd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/select-kit/addon/components/category-chooser.js
View File

@ -17,8 +17,7 @@ export default ComboBoxComponent.extend({
selectKitOptions: { selectKitOptions: {
filterable: true, filterable: true,
autoInsertNoneItem: false, allowUncategorized: false,
allowUncategorized: "allowUncategorizedTopics",
allowSubCategories: true, allowSubCategories: true,
permissionType: PermissionType.FULL, permissionType: PermissionType.FULL,
excludeCategoryId: null, excludeCategoryId: null,
@ -55,7 +54,10 @@ export default ComboBoxComponent.extend({
I18n.t(isString ? this.selectKit.options.none : "category.none") I18n.t(isString ? this.selectKit.options.none : "category.none")
) )
); );
} else if (this.selectKit.options.allowUncategorized) { } else if (
this.allowUncategorizedTopics ||
this.selectKit.options.allowUncategorized
) {
return Category.findUncategorized(); return Category.findUncategorized();
} else { } else {
const defaultCategoryId = parseInt( const defaultCategoryId = parseInt(
@ -92,7 +94,6 @@ export default ComboBoxComponent.extend({
search(filter) { search(filter) {
if (this.site.lazy_load_categories) { if (this.site.lazy_load_categories) {
return Category.asyncSearch(this._normalize(filter), { return Category.asyncSearch(this._normalize(filter), {
includeUncategorized: this.allowUncategorizedTopics,
scopedCategoryId: this.selectKit.options?.scopedCategoryId, scopedCategoryId: this.selectKit.options?.scopedCategoryId,
prioritizedCategoryId: this.selectKit.options?.prioritizedCategoryId, prioritizedCategoryId: this.selectKit.options?.prioritizedCategoryId,
}); });

3
app/assets/javascripts/select-kit/addon/components/category-drop.js
View File

@ -24,7 +24,6 @@ export default ComboBoxComponent.extend({
navigateToEdit: false, navigateToEdit: false,
editingCategory: false, editingCategory: false,
editingCategoryTab: null, editingCategoryTab: null,
allowUncategorizedTopics: setting("allow_uncategorized_topics"),
selectKitOptions: { selectKitOptions: {
filterable: true, filterable: true,
@ -41,7 +40,7 @@ export default ComboBoxComponent.extend({
displayCategoryDescription: "displayCategoryDescription", displayCategoryDescription: "displayCategoryDescription",
headerComponent: "category-drop/category-drop-header", headerComponent: "category-drop/category-drop-header",
parentCategory: false, parentCategory: false,
allowUncategorized: "allowUncategorizedTopics", allowUncategorized: setting("allow_uncategorized_topics"),
}, },
modifyComponentForRow() { modifyComponentForRow() {