diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php index 3c144fea8..c7a5acca8 100644 --- a/resources/views/base.blade.php +++ b/resources/views/base.blade.php @@ -55,6 +55,9 @@ @if(signedInUser() && userCan('settings-manage')) @icon('settings'){{ trans('settings.settings') }} @endif + @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage')) + @icon('users'){{ trans('settings.users') }} + @endif @if(!signedInUser()) @if(setting('registration-enabled', false)) @icon('new-user') {{ trans('auth.sign_up') }} diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php index d22946799..da2abb0bd 100644 --- a/tests/Permissions/RolesTest.php +++ b/tests/Permissions/RolesTest.php @@ -109,6 +109,16 @@ class RolesTest extends BrowserKitTest ->seePageIs('/settings/users'); } + public function test_manage_users_permission_shows_link_in_header_if_does_not_have_settings_manage_permision() + { + $usersLink = 'href="'.url('/settings/users') . '"'; + $this->actingAs($this->user)->visit('/')->dontSee($usersLink); + $this->giveUserPermissions($this->user, ['users-manage']); + $this->actingAs($this->user)->visit('/')->see($usersLink); + $this->giveUserPermissions($this->user, ['settings-manage', 'users-manage']); + $this->actingAs($this->user)->visit('/')->dontSee($usersLink); + } + public function test_user_roles_manage_permission() { $this->actingAs($this->user)->visit('/settings/roles')