diff --git a/app/Http/Controllers/Dashboard/AdminController.php b/app/Http/Controllers/Dashboard/AdminController.php index 0b1c605e8..c6ce8df78 100644 --- a/app/Http/Controllers/Dashboard/AdminController.php +++ b/app/Http/Controllers/Dashboard/AdminController.php @@ -131,13 +131,21 @@ class AdminController extends Controller } public function displayModifyUser(Request $request) { + $permissions = array(); + $name = $request->user; //Get the user information from the name $user = User::where(['name' => $name])->first(); + $perms = AvailablePermission::all(); + foreach($perms as $p) { + $permissions[$p->permission] = $p->permission; + } + //Pass the user information to the page for hidden text entries - return view('admin.user.modify')->with('user', $user); + return view('admin.user.modify')->with('user', $user) + ->with('permissions', $permissions); } public function modifyUser(Request $request) { diff --git a/resources/views/admin/user/modify.blade.php b/resources/views/admin/user/modify.blade.php index d199a7dc7..d331af2bf 100644 --- a/resources/views/admin/user/modify.blade.php +++ b/resources/views/admin/user/modify.blade.php @@ -22,13 +22,7 @@ {{ Form::open(['action' => 'Dashboard\AdminController@addPermission', 'method' => 'POST']) }}
{{ Form::hidden('user', $user->name) }} - {{ Form::select('permission', [ - 'structure.operator' => 'structure.operator', - 'logistics.minion' => 'logistics.minion', - 'admin.finance' => 'admin.finance', - 'contract.admin' => 'contract.admin', - 'contract.canbid' => 'contract.canbid', - ], 'None') }} + {{ Form::select('permission', $permissions, 'None', ['class' => 'form-control']) }} {{ Form::hidden('type', 'addPermission') }}