Merge staging into master

csvalpha · Sep 11, 2023 · 3555dd2 · 3555dd2
2 parents 84fd874 + d6160a1
commit 3555dd2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/abilities/user.js b/app/abilities/user.js
@@ -14,7 +14,7 @@ export default class User extends Ability {
   }
 
   get canShowOwn() {
-    return this.session.isAuthenticated;
+    return this.session.isAuthenticated && this.session.currentUser?.id;
   }
 
   get canCreate() {

diff --git a/app/components/menu-sidebar.hbs b/app/components/menu-sidebar.hbs
@@ -37,7 +37,7 @@
       <div class='profile-menu {{if layoutManager.profileMenuOpen "open"}}'>
         <MenuSidebarItem
           @link='users.user'
-          @hasPermission={{can 'show individual users'}}
+          @hasPermission={{can 'show own users'}}
           @icon='user'
           @title={{t 'mixin.menuItems.profile'}}
           @minor={{true}}

diff --git a/app/routes/profile.js b/app/routes/profile.js
@@ -5,7 +5,7 @@ export default class ProfileRoute extends AuthenticatedRoute {
   @service router;
 
   canAccess() {
-    return this.abilities.can('show individual users');
+    return this.abilities.can('show own users');
   }
 
   redirect() {