Skip to content

Commit

Permalink
Merge staging into master
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Sep 11, 2023
2 parents d929c2b + 281a73b commit 84fd874
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions app/components/footer-nav.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
<td class='footer-table-cell'>
<a
class='footer-text'
href='tel:+31637428840'
href='tel:+31682066827'
itemprop='telephone'
content='+31637428840'
content='+31682066827'
>
06-37428840
06-82066827
</a>
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion app/components/menu-sidebar.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class='profile-menu {{if layoutManager.profileMenuOpen "open"}}'>
<MenuSidebarItem
@link='users.user'
@hasPermission={{can 'show activities'}}
@hasPermission={{can 'show individual users'}}
@icon='user'
@title={{t 'mixin.menuItems.profile'}}
@minor={{true}}
Expand Down
2 changes: 1 addition & 1 deletion app/routes/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default class ProfileRoute extends AuthenticatedRoute {
@service router;

canAccess() {
return this.abilities.can('show users');
return this.abilities.can('show individual users');
}

redirect() {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/users/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default class UserRoute extends AuthenticatedRoute {
}

canAccess() {
return this.abilities.can('show users');
return this.abilities.can('show individual users');
}

model(params) {
Expand Down
2 changes: 1 addition & 1 deletion app/routes/users/user/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default class UserIndexRoute extends AuthenticatedRoute {
link: 'users.user.index',
title: 'Algemeen',
linkArgument: user,
canAccess: this.abilities.can('show users'),
canAccess: this.abilities.can('show individual users'),
},
{
link: 'users.user.groups',
Expand Down

0 comments on commit 84fd874

Please sign in to comment.