Merge remote-tracking branch 'origin/staging' into origin/production

This commit is contained in:
Linksehat Staging Server
2024-06-20 16:10:13 +07:00
309 changed files with 1622 additions and 1651 deletions

View File

@@ -28,7 +28,17 @@ class UserManagementController extends Controller
public function permission_list(Request $request)
{
$permissions = Permission::all();
// Ambil nilai guard_name dari query string
$guardName = $request->query('guard_name');
// Jika guard_name ada dalam query, filter berdasarkan guard_name
if ($guardName) {
$permissions = Permission::where('guard_name', $guardName)->orderBy('name','asc')->get();
} else {
// Jika guard_name tidak ada, ambil semua permissions
$permissions = Permission::all();
}
return response()->json($permissions);
}
@@ -73,7 +83,7 @@ class UserManagementController extends Controller
]);
if (isset($validated['permission_check'])) {
$permissions = Permission::whereIn('id', $validated['permission_check'])
->where('guard_name', $validated['guard_name'])
->get();
@@ -145,7 +155,7 @@ class UserManagementController extends Controller
if ($request->password){
$userAccess->password = Hash::make($request->password);
}
}
$person = Person::updateOrCreate(
[