diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.hbs b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
index 25d68a27578..3fdef279b46 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.hbs
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.hbs
@@ -22,10 +22,24 @@
{{/if}}
{{#if this.showCategoryAdmin}}
-
+ {{#if this.fixedCategoryPositions}}
+
+ {{else}}
+
+ {{/if}}
{{/if}}
{{#if (and this.category this.showCategoryEdit)}}
diff --git a/app/assets/javascripts/discourse/app/components/d-navigation.js b/app/assets/javascripts/discourse/app/components/d-navigation.js
index fbc7426b783..96d7dcdc1bf 100644
--- a/app/assets/javascripts/discourse/app/components/d-navigation.js
+++ b/app/assets/javascripts/discourse/app/components/d-navigation.js
@@ -4,6 +4,7 @@ import { action } from "@ember/object";
import { dependentKeyCompat } from "@ember/object/compat";
import { inject as service } from "@ember/service";
import { htmlSafe } from "@ember/template";
+import { setting } from "discourse/lib/computed";
import { filterTypeForMode } from "discourse/lib/filter-mode";
import { NotificationLevels } from "discourse/lib/notification-levels";
import NavItem from "discourse/models/nav-item";
@@ -14,6 +15,7 @@ export default Component.extend({
dialog: service(),
tagName: "",
filterMode: tracked(),
+ fixedCategoryPositions: setting("fixed_category_positions"),
@dependentKeyCompat
get filterType() {
diff --git a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
index a0509083251..0ee4dab16b0 100644
--- a/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
+++ b/app/assets/javascripts/select-kit/addon/components/categories-admin-dropdown.js
@@ -1,12 +1,10 @@
import { computed } from "@ember/object";
-import { setting } from "discourse/lib/computed";
import I18n from "discourse-i18n";
import DropdownSelectBoxComponent from "select-kit/components/dropdown-select-box";
export default DropdownSelectBoxComponent.extend({
pluginApiIdentifiers: ["categories-admin-dropdown"],
classNames: ["categories-admin-dropdown"],
- fixedCategoryPositions: setting("fixed_category_positions"),
selectKitOptions: {
icons: ["wrench", "caret-down"],
@@ -26,14 +24,12 @@ export default DropdownSelectBoxComponent.extend({
},
];
- if (this.fixedCategoryPositions) {
- items.push({
- id: "reorder",
- name: I18n.t("categories.reorder.title"),
- description: I18n.t("categories.reorder.title_long"),
- icon: "random",
- });
- }
+ items.push({
+ id: "reorder",
+ name: I18n.t("categories.reorder.title"),
+ description: I18n.t("categories.reorder.title_long"),
+ icon: "random",
+ });
return items;
}),