From 54b36cd30581d49382a4a58e752357a28955919c Mon Sep 17 00:00:00 2001
From: Christopher Wilkinson <cwilkinson000@gmail.com>
Date: Tue, 13 Nov 2018 13:43:20 +0000
Subject: [PATCH 1/2] Show users link in top nav if user is signed in and only
 manages users

---
 resources/views/base.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php
index e6d0b7761..535548b3b 100644
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -55,6 +55,9 @@
                             @if(signedInUser() && userCan('settings-manage'))
                                 <a href="{{ baseUrl('/settings') }}">@icon('settings'){{ trans('settings.settings') }}</a>
                             @endif
+                            @if(signedInUser() && userCan('users-manage') && !userCan('settings-manage'))
+                                <a href="{{ baseUrl('/settings/users') }}">@icon('users'){{ trans('settings.users') }}</a>
+                            @endif
                             @if(!signedInUser())
                                 <a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
                             @endif

From 50e5527483cb67e0cf61a1d449514a0e99d88bc4 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 5 Jan 2019 15:22:47 +0000
Subject: [PATCH 2/2] Added test to cover "users" header link in correct
 permission conditions

---
 tests/Permissions/RolesTest.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

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')