Skip to content

Validate settings categories by checking for existing views #5255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ssddanbrown merged 2 commits into from
Oct 11, 2024
Merged

Validate settings categories by checking for existing views #5255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b5003
Refactor SettingController to validate categies by existing view files
LachTrip Oct 10, 2024
a3d0f74
Move settings category layouts into their own view folder
LachTrip Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/Settings/SettingController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

class SettingController extends Controller
{
protected array $settingCategories = ['features', 'customization', 'registration'];

/**
* Handle requests to the settings index path.
*/
Expand All @@ -31,7 +29,7 @@ public function category(string $category)
// Get application version
$version = trim(file_get_contents(base_path('version')));

return view('settings.' . $category, [
return view('settings.categories.' . $category, [
'category' => $category,
'version' => $version,
'guestUser' => User::getGuest(),
Expand Down Expand Up @@ -59,8 +57,8 @@ public function update(Request $request, AppSettingsStore $store, string $catego

protected function ensureCategoryExists(string $category): void
{
if (!in_array($category, $this->settingCategories)) {
abort(404);
if (!view()->exists('settings.categories.' . $category)) {
abort(404, 'Category not found');
}
}
}
0 ...es/views/settings/customization.blade.php → ...ttings/categories/customization.blade.php
View file
Open in desktop
File renamed without changes.
0 resources/views/settings/features.blade.php → ...ws/settings/categories/features.blade.php
View file
Open in desktop
File renamed without changes.
0 ...ces/views/settings/registration.blade.php → ...ettings/categories/registration.blade.php
View file
Open in desktop
File renamed without changes.