From 25bd1acab5301a71e8d071dd4b78b140947582a5 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 31 Oct 2016 18:19:55 -0700 Subject: [PATCH] Fixes permission for non-superadmin assigning user permissions --- resources/views/users/edit.blade.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index ae59626a95..65bf9baba5 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -440,15 +440,27 @@

{{ $area . ': ' . $localPermission['label'] }}

- - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }} + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled"]) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant"]) }} + @endif - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }} + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled"]) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny"]) }} + @endif + - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }} + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled"] ) }} + @else + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit"] ) }} + @endif