From 7782c59f5bc265878b6ee0eedd448f5df624ed14 Mon Sep 17 00:00:00 2001
From: mirivlad <mirivlad@lms.local>
Date: Mon, 30 Mar 2026 11:28:03 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20UX=20=D1=83=D0=BB=D1=83=D1=87=D1=88?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ 1. Ссылка 'Все пользователи' в просмотре организации
✅ 2. Кнопка '+' для группы с предустановленной организацией
✅ 3. Упрощён выбор типа группы (по умолчанию организация)
✅ 4. Исправлена ошибка GroupPolicy::update()
✅ 5. Управление группами в редактировании пользователя
✅ Показ всех доступных групп (общие + организации)

Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
---
 app/Http/Controllers/Admin/UserController.php      | 12 ++++++++++--
 resources/views/admin/groups/create.blade.php      |  8 ++++----
 resources/views/admin/organizations/show.blade.php |  7 +++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php
index 5af50ad..27314e1 100755
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@@ -114,12 +114,20 @@ class UserController extends Controller
     public function edit(User $user)
     {
         Gate::authorize('update', $user);
-        
+
         $organizations = Organization::pluck('name', 'id');
         $roles = Role::pluck('name', 'name');
         $userGroups = $user->groups->pluck('id')->toArray();
-        $allGroups = $user->organization ? $user->organization->groups : collect();
         
+        // Показываем все доступные группы: общие + группы организации пользователя
+        if ($user->organization_id) {
+            $allGroups = Group::whereNull('organization_id')
+                ->orWhere('organization_id', $user->organization_id)
+                ->get();
+        } else {
+            $allGroups = Group::whereNull('organization_id')->get();
+        }
+
         return view('admin.users.edit', compact('user', 'organizations', 'roles', 'userGroups', 'allGroups'));
     }
 
diff --git a/resources/views/admin/groups/create.blade.php b/resources/views/admin/groups/create.blade.php
index d97b82a..80491b6 100755
--- a/resources/views/admin/groups/create.blade.php
+++ b/resources/views/admin/groups/create.blade.php
@@ -20,20 +20,20 @@
                                 <div class="mb-3">
                                     <label class="form-label">Тип группы *</label>
                                     <select name="group_type" id="groupType" class="form-select @error('group_type') is-invalid @enderror" required onchange="toggleOrganizationField()">
-                                        <option value="">Выберите тип</option>
-                                        <option value="organization" {{ old('group_type') == 'organization' ? 'selected' : '' }}>Группа организации</option>
-                                        <option value="general" {{ old('group_type') == 'general' ? 'selected' : '' }}>Общая группа</option>
+                                        <option value="organization" {{ old('group_type', request('organization_id') ? 'organization' : '') == 'organization' ? 'selected' : '' }}>Группа организации</option>
+                                        <option value="general" {{ old('group_type', request('organization_id') ? '' : 'general') == 'general' ? 'selected' : '' }}>Общая группа</option>
                                     </select>
                                     <small class="text-muted">Группа организации — только пользователи этой организации. Общая — любые пользователи.</small>
                                     @error('group_type')<div class="invalid-feedback">{{ $message }}</div>@enderror
                                 </div>
                                 
-                                <div class="mb-3" id="organizationField" style="display:none;">
+                                <div class="mb-3" id="organizationField" style="display:{{ request('organization_id') || old('group_type') == 'organization' ? 'block' : 'none' }};">
                                     <label class="form-label">Организация *</label>
                                     <x-searchable-select
                                         name="organization_id"
                                         url="{{ route('api.organizations.search') }}"
                                         placeholder="Начните вводить название организации..."
+                                        :value="request('organization_id') ?: old('organization_id')"
                                         :required="true"
                                     />
                                     @error('organization_id')<div class="invalid-feedback d-block">{{ $message }}</div>@enderror
diff --git a/resources/views/admin/organizations/show.blade.php b/resources/views/admin/organizations/show.blade.php
index 9d4c6fe..2986b41 100644
--- a/resources/views/admin/organizations/show.blade.php
+++ b/resources/views/admin/organizations/show.blade.php
@@ -107,15 +107,18 @@
             <div class="row">
                 <div class="col-md-6 mb-4">
                     <div class="card shadow-sm">
-                        <div class="card-header">
+                        <div class="card-header d-flex justify-content-between align-items-center">
                             <h5 class="mb-0"><i class="bi bi-people"></i> Пользователи</h5>
+                            <a href="{{ route('admin.users.index', ['organization_id' => $organization->id]) }}" class="btn btn-sm btn-primary">
+                                Все пользователи <i class="bi bi-arrow-right"></i>
+                            </a>
                         </div>
                         <div class="card-body">
                             @if($organization->users->count() > 0)
                             <ul class="list-group list-group-flush">
                                 @foreach($organization->users->take(5) as $user)
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
-                                    {{ $user->name }}
+                                    <a href="{{ route('admin.users.show', $user) }}" class="text-decoration-none">{{ $user->name }}</a>
                                     <small class="text-muted">{{ $user->email }}</small>
                                 </li>
                                 @endforeach