RMB for custom fields

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2025-02-20 14:57:18 +00:00
parent 3150ad50c9
commit 76f038d142

View file

@ -35,10 +35,12 @@ class CustomFieldsetsController extends Controller
* @param int $id * @param int $id
* @since [v1.8] * @since [v1.8]
*/ */
public function show($id) : View | RedirectResponse public function show(CustomFieldset $fieldset) : View | RedirectResponse
{ {
$cfset = CustomFieldset::with('fields') $cfset = CustomFieldset::with('fields')
->where('id', '=', $id)->orderBy('id', 'ASC')->first(); ->where('id', '=', $fieldset->id)
->orderBy('id', 'ASC')
->first();
$this->authorize('view', $cfset); $this->authorize('view', $cfset);
@ -122,18 +124,12 @@ class CustomFieldsetsController extends Controller
* @param int $id * @param int $id
* @since [v6.0.14] * @since [v6.0.14]
*/ */
public function edit($id) : View | RedirectResponse public function edit(CustomFieldset $fieldset) : View | RedirectResponse
{ {
$this->authorize('create', CustomField::class); $this->authorize('create', CustomField::class);
if ($fieldset = CustomFieldset::find($id)) {
return view('custom_fields.fieldsets.edit')->with('item', $fieldset); return view('custom_fields.fieldsets.edit')->with('item', $fieldset);
} }
return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
}
/** /**
* Saves updated fieldset data * Saves updated fieldset data
* *
@ -141,12 +137,10 @@ class CustomFieldsetsController extends Controller
* @param int $id * @param int $id
* @since [v6.0.14] * @since [v6.0.14]
*/ */
public function update(Request $request, $id) : RedirectResponse public function update(Request $request, CustomFieldset $fieldset) : RedirectResponse
{ {
$this->authorize('create', CustomField::class); $this->authorize('create', CustomField::class);
if ($fieldset = CustomFieldset::find($id)) {
$fieldset->name = $request->input('name'); $fieldset->name = $request->input('name');
if ($fieldset->save()) { if ($fieldset->save()) {
@ -157,9 +151,6 @@ class CustomFieldsetsController extends Controller
} }
return redirect()->route('fields.index')->with('error', trans('admin/custom_fields/general.fieldset_does_not_exist', ['id' => $id]));
}
/** /**
* Validates a custom fieldset and then deletes if it has no models associated. * Validates a custom fieldset and then deletes if it has no models associated.
* *