diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index daaa86e..4fc0c8c 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -184,7 +184,7 @@ class UserController extends Controller $user->username = $validated['username']; $user->email = $validated['email']; $user->role = $validated['role']; - $user->gate_id = $validated['gate_id'] ?? null; + $user->gate_id = array_key_exists('gate_id', $validated) ? $validated['gate_id'] : $user->gate_id; $passwordUpdated = false; if (!empty($validated['password'])) { diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php index 5f27dbe..391acaf 100644 --- a/resources/views/admin/users/index.blade.php +++ b/resources/views/admin/users/index.blade.php @@ -189,7 +189,6 @@ Pengguna Email Role RBAC - Penempatan Pos Terdaftar Aksi @@ -239,16 +238,6 @@ @endif - - @if($user->gate) - - - {{ $user->gate->name }} - - @else - - - @endif - {{ $user->created_at->format('d M Y') }} @@ -274,7 +263,7 @@ @empty - + Tidak ada data pengguna yang sesuai kriteria pencarian. @@ -350,25 +339,14 @@ -
-
- - -
-
- - -
+
+ +
@@ -443,24 +421,13 @@
-
-
- - -
-
- - -
+
+ +
@@ -704,7 +671,8 @@ document.getElementById('edit_username').value = user.username; document.getElementById('edit_email').value = user.email; document.getElementById('edit_role').value = primaryRole; - document.getElementById('edit_gate_id').value = user.gate_id || ''; + const editGateEl = document.getElementById('edit_gate_id'); + if (editGateEl) editGateEl.value = user.gate_id || ''; const editPhotoPreview = document.getElementById('editUserPhotoPreview'); const editPhotoPlaceholder = document.getElementById('editUserPhotoPlaceholder');