DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #10480 from snipe/fixes/check_for_valid_custom_field

Browse source 
Fixed format property on invalid custom field object when trying to edit a field that doesn't exist
This commit is contained in:
snipe 2022-01-03 19:28:25 -08:00 committed by GitHub
parent 7a1ab1292c 884b6b0270
commit b78e610ce3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/Http/Controllers/CustomFieldsController.php
View file

@ -178,20 +178,25 @@ class CustomFieldsController extends Controller
*/ */
public function edit($id) public function edit($id)
{ {
$field = CustomField::find($id); if ($field = CustomField::find($id)) {
$this->authorize('update', $field); $this->authorize('update', $field);
$customFormat = ''; $customFormat = '';
if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) { if((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
$customFormat = $field->format; $customFormat = $field->format;
} }
return view("custom_fields.fields.edit",[ return view("custom_fields.fields.edit",[
'field' => $field, 'field' => $field,
'customFormat' => $customFormat, 'customFormat' => $customFormat,
'predefinedFormats' => Helper::predefined_formats() 'predefinedFormats' => Helper::predefined_formats()
]); ]);
}
return redirect()->route("fields.index")
->with("error", trans('admin/custom_fields/message.field.invalid'));
} }