From 28ea75512c6f208e52ed16be67e50988a4853e90 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 13:47:23 -0700 Subject: [PATCH 1/7] Replace from Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index a6a6abf9e..2ff5b79f6 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -59,15 +59,33 @@ - {{ Form::radio("$area", '1',false,['value'=>"grant", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }} + - {{ Form::radio("$area", '-1',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }} + - {{ Form::radio("$area", '0',false,['value'=>"inherit", 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }} + From 97d2e6f9d4dd11b27da68bef2b94bbca3c47963c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:03:27 -0700 Subject: [PATCH 2/7] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 2ff5b79f6..ffd3a3ce3 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -102,12 +102,15 @@ - - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + /> @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) From ea2f0cdd7b348d7bcf2900fb21e80bf59e5f11b9 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:18:01 -0700 Subject: [PATCH 3/7] Replace a Form::radio on user edit page --- .../partials/forms/edit/permissions-base.blade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index ffd3a3ce3..83869fcf9 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -113,11 +113,15 @@ /> - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + /> @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) From 51f67082f44b9ab36079194e45679b7f57af37b1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:23:39 -0700 Subject: [PATCH 4/7] Replace a Form::radio on user edit page --- .../partials/forms/edit/permissions-base.blade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 83869fcf9..87ddf32cd 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -124,11 +124,15 @@ /> - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + /> @endif From 36be23f7e44d87aebb82347c0fa3c3e45f28fd33 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:57:03 -0700 Subject: [PATCH 5/7] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 87ddf32cd..bf4f20110 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -18,11 +18,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @endif From 8ca11542f8f7d736eaa6ffb6bbd83f5451f7ccf6 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 15:03:54 -0700 Subject: [PATCH 6/7] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index bf4f20110..177ce43e8 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -37,11 +37,11 @@ /> @else @endif @@ -50,11 +50,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @endif From db3f8e5d683abf0e2fd0c7b8e76b63d5a4060535 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 15:08:05 -0700 Subject: [PATCH 7/7] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 177ce43e8..ad166888c 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -81,11 +81,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @endif