From 2e1fdee0177abe7ac02f8362c53e3dab919e6c7a Mon Sep 17 00:00:00 2001 From: mirivlad Date: Mon, 30 Mar 2026 15:43:14 +0800 Subject: [PATCH] =?UTF-8?q?Feat:=20searchable-select=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BE=D1=80=D0=B3=D0=B0=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ✅ edit.blade.php — выбор организации через searchable-select ✅ create.blade.php — выбор организации через searchable-select ✅ Контроллер не передаёт $organizations Co-authored-by: Qwen-Coder --- app/Http/Controllers/Admin/UserController.php | 10 ++++------ resources/views/admin/users/create.blade.php | 12 ++++++------ resources/views/admin/users/edit.blade.php | 12 ++++++------ 3 files changed, 16 insertions(+), 18 deletions(-) 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 @@
Настройки
- +
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 78a5c76..b74738d 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -45,12 +45,12 @@
Настройки
- +