A free open source IT asset/license management system
Warn if user has individual permission overrides
snipedf68dca9dc1c
diff --git a/app/Models/User.php b/app/Models/User.phpindex fda296ff91..a55acc3310 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -224,6 +224,24 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCoreturn false;}+ public function hasIndividualPermissions() {++ if (is_object($this->permissions)) {+ $permissions = json_decode(json_encode($this->permissions), true);+ }++ if (is_string($this->permissions)) {+ $permissions = json_decode($this->permissions, true);+ }++ foreach ($permissions as $permission) {+ if ($permission != 0) {+ return true;+ }+ }+ return false;+ }+/*** Internally check the user permission for the given section*diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.phpindex a5e1a915f1..63984ba0c8 100755--- a/resources/views/users/view.blade.php+++ b/resources/views/users/view.blade.php@@ -426,17 +426,19 @@<div class="col-md-9">@if ($user->groups->count() > 0)@foreach ($user->groups as $group)-@can('superadmin')<a href="{{ route('groups.show', $group->id) }}" class="label label-default">{{ $group->name }}</a>@else{{ $group->name }}@endcan-@endforeach@else--@endif++ @if ($user->hasIndividualPermissions())+ <span class="text-warning"><x-icon type="warning" />This user has at least one individual permission set.</span>+ @endif</div></div>