github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 13:06:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Admin sidebar was hiding chat/forum toggle button (#25781)

Browse Source 
We have separated and combined modes for sidebar panels.
Separated means the panels show only their own sections,
combined means sections from all panels are shown.

The admin sidebar only shows its own panels, so it must set
the mode to separated; however when we navigate to chat or
home we must revert to the initial mode setttings.
This commit is contained in:
Martin Brennan
2024-02-21 14:44:09 +10:00
committed by GitHub
parent 95014e9ab8
commit ac92cc526d
4 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/admin/addon/routes/admin.js
View File

@ -1,5 +1,11 @@
import { tracked } from "@glimmer/tracking";
import { inject as service } from "@ember/service";
import { ADMIN_PANEL, MAIN_PANEL } from "discourse/lib/sidebar/panels";
import {
ADMIN_PANEL,
COMBINED_MODE,
MAIN_PANEL,
SEPARATED_MODE,
} from "discourse/lib/sidebar/panels";
import DiscourseRoute from "discourse/routes/discourse";
import I18n from "discourse-i18n";
@ -7,6 +13,7 @@ export default class AdminRoute extends DiscourseRoute {
@service sidebarState;
@service siteSettings;
@service currentUser;
@tracked initialSidebarState;
titleToken() {
return I18n.t("admin_title");
@ -14,6 +21,11 @@ export default class AdminRoute extends DiscourseRoute {
activate() {
if (this.currentUser.use_admin_sidebar) {
this.initialSidebarState = {
mode: this.sidebarState.mode,
displaySwitchPanelButtons: this.sidebarState.displaySwitchPanelButtons,
};
this.sidebarState.setPanel(ADMIN_PANEL);
this.sidebarState.setSeparatedMode();
this.sidebarState.hideSwitchPanelButtons();
@ -29,6 +41,18 @@ export default class AdminRoute extends DiscourseRoute {
if (this.currentUser.use_admin_sidebar) {
if (!transition?.to.name.startsWith("admin")) {
if (this.initialSidebarState.mode === SEPARATED_MODE) {
this.sidebarState.setSeparatedMode();
} else if (this.initialSidebarState.mode === COMBINED_MODE) {
this.sidebarState.setCombinedMode();
}
if (this.initialSidebarState.displaySwitchPanelButtons) {
this.sidebarState.showSwitchPanelButtons();
} else {
this.sidebarState.hideSwitchPanelButtons();
}
this.sidebarState.setPanel(MAIN_PANEL);
}
}