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: Hide experimental user navigation changes when disabled (#18327)

Browse Source 
Followup to b066955838
This commit is contained in:
David Taylor 2022-09-22 10:26:01 +01:00 committed by GitHub
parent da47e448ac
commit 7a622f22bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/discourse/app/controllers/user.js
View File

@ -198,6 +198,17 @@ export default Controller.extend(CanCheckEmails, {
this.toggleProperty("displayUserNav");
},
get displayTopLevelAdminButton() {
if (!this.currentUser?.staff) {
return false;
}
if (this.currentUser?.redesigned_user_page_nav_enabled) {
return this.site.desktopView;
} else {
return true;
}
},
actions: {
collapseProfile() {
this.set("forceExpand", false);

4
app/assets/javascripts/discourse/app/templates/user.hbs
View File

@ -66,7 +66,7 @@
</li>
{{/if}}
{{#if (and this.site.desktopView this.currentUser.staff)}}
{{#if this.displayTopLevelAdminButton}}
<li><a href={{this.model.adminPath}} class="btn btn-default">{{d-icon "wrench"}}<span class="d-button-label">{{i18n "admin.user.show_admin_profile"}}</span></a></li>
{{/if}}
@ -78,7 +78,7 @@
</li>
{{/if}}
{{#if this.site.mobileView}}
{{#if (and this.site.mobileView this.currentUser.redesigned_user_page_nav_enabled)}}
<li>
<DButton @class="btn-default toggle-mobile-user-menu" @action={{this.toggleUserNav}} @icon="bars" @label="hamburger_menu" />
</li>