boursecu/boursecu_server
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix setting bug

Browse Source
This commit is contained in:
mohmdsdg
2026-08-18 18:32:41 +03:30
parent 351510d500
commit 5337818396
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/SettingsController.php
+13 -4
View File
@@ -28,10 +28,14 @@ class SettingsController extends Controller
->select(Setting::adminSelectColumns()) ->select(Setting::adminSelectColumns())
->orderBy('key'); ->orderBy('key');
$skipOverlay = $request->boolean('skip_overlay');
if ($request->boolean('system_only')) { if ($request->boolean('system_only')) {
$overlay = app(SuperAdminProgramSettingsOverlay::class)->items(); if (! $skipOverlay) {
if ($overlay) { $overlay = app(SuperAdminProgramSettingsOverlay::class)->items();
return response()->json($this->authorizeSettingsPayload($this->overlayToRows($overlay))); if ($overlay) {
return response()->json($this->authorizeSettingsPayload($this->overlayToRows($overlay)));
}
} }
$rows = $query $rows = $query
@@ -52,8 +56,13 @@ class SettingsController extends Controller
return response()->json($this->authorizeSettingsPayload($query->where('can_edit', 1)->get())); return response()->json($this->authorizeSettingsPayload($query->where('can_edit', 1)->get()));
} }
$local = $query->get();
if ($skipOverlay) {
return response()->json($this->authorizeSettingsPayload($local));
}
return response()->json($this->authorizeSettingsPayload( return response()->json($this->authorizeSettingsPayload(
$this->mergeOverlayIntoLocal($query->get()) $this->mergeOverlayIntoLocal($local)
)); ));
} }