From 9656303c632bd307eb76f5770da1c31fe5b45b84 Mon Sep 17 00:00:00 2001 From: jumagura Date: Fri, 6 Oct 2023 22:35:36 -0400 Subject: [PATCH] DEV: Refactor staff condition in category-chooser for simplicity --- .../discourse/initializers/custom-wizard-edits.js.es6 | 2 +- .../javascripts/acceptance/category-chooser-initializer-test.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 index cef4c659..ca72fa4b 100644 --- a/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 +++ b/assets/javascripts/discourse/initializers/custom-wizard-edits.js.es6 @@ -88,7 +88,7 @@ export default { categoriesByScope(options = {}) { let categories = this._super(options); const currentUser = this.currentUser; - if (!(currentUser && (currentUser.admin || currentUser.staff))) { + if (!currentUser?.staff) { categories = categories.filter((category) => { return !category.custom_fields?.create_topic_wizard; }); diff --git a/test/javascripts/acceptance/category-chooser-initializer-test.js b/test/javascripts/acceptance/category-chooser-initializer-test.js index edf9004c..0348e5bb 100644 --- a/test/javascripts/acceptance/category-chooser-initializer-test.js +++ b/test/javascripts/acceptance/category-chooser-initializer-test.js @@ -4,7 +4,7 @@ import selectKit from "discourse/tests/helpers/select-kit-helper"; import { test } from "qunit"; acceptance("Category Chooser Initializer for regular users", function (needs) { - needs.user({ staff: false, admin: false, moderator: false }); + needs.user({ admin: false, moderator: false }); needs.settings({ allow_uncategorized_topics: false, });