diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 6ac4316..07b288f 100755 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -50,11 +50,10 @@ class UserController extends Controller public function create() { Gate::authorize('create', User::class); - - $organizations = Organization::pluck('name', 'id'); + $roles = Role::pluck('name', 'name'); - - return view('admin.users.create', compact('organizations', 'roles')); + + return view('admin.users.create', compact('roles')); } public function store(Request $request) @@ -100,7 +99,6 @@ class UserController extends Controller Gate::authorize('update', $user); $user->load('groups'); - $organizations = Organization::pluck('name', 'id'); $roles = Role::pluck('name', 'name'); $userGroups = $user->groups->pluck('id')->toArray(); @@ -113,7 +111,7 @@ class UserController extends Controller $allGroups = Group::whereNull('organization_id')->get(); } - return view('admin.users.edit', compact('user', 'organizations', 'roles', 'userGroups', 'allGroups')); + return view('admin.users.edit', compact('user', 'roles', 'userGroups', 'allGroups')); } public function update(Request $request, User $user) diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php index 95337a9..35d0e62 100644 --- a/resources/views/admin/users/create.blade.php +++ b/resources/views/admin/users/create.blade.php @@ -46,12 +46,12 @@