admin/HRM-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve empty string issue with Radix UI Select for branch selection

Browse Source
This commit is contained in:
admin
2026-07-15 11:12:05 +08:00
parent 2bef04470e
commit ccfe622b52
416 changed files with 25003 additions and 14521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/ShiftController.php
View File

@@ -119,7 +119,7 @@ class ShiftController extends Controller
if (!Auth::user()->can('manage-any-shifts')) {
$validated['branch_id'] = Auth::user()->branch_id ?? Auth::user()->employee->branch_id ?? null;
} else {
$validated['branch_id'] = $request->input('branch_id') ?: null;
$validated['branch_id'] = ($request->input('branch_id') === 'none' || empty($request->input('branch_id'))) ? null : $request->input('branch_id');
}
// Check if shift with same name already exists
@@ -166,13 +166,13 @@ class ShiftController extends Controller
'grace_period' => 'required|integer|min:0',
'is_night_shift' => 'boolean',
'status' => 'nullable|in:active,inactive',
'branch_id' => 'nullable|exists:branches,id',
'branch_id' => 'nullable',
]);
if (!Auth::user()->can('manage-any-shifts')) {
$validated['branch_id'] = Auth::user()->branch_id ?? Auth::user()->employee->branch_id ?? null;
} else {
$validated['branch_id'] = $request->input('branch_id') ?: null;
$validated['branch_id'] = ($request->input('branch_id') === 'none' || empty($request->input('branch_id'))) ? null : $request->input('branch_id');
}
// Check if shift with same name already exists (excluding current)