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

Check that the field is valid before checking to see count()

Browse source 
This mostly affects the demo, since the seeder updates info often

Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2021-04-20 15:10:28 -07:00
parent e286ff0be3
commit c17eaaad69
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -151,11 +151,11 @@ class CustomFieldsController extends Controller
*/ */
public function destroy($field_id) public function destroy($field_id)
{ {
$field = CustomField::find($field_id); if ($field = CustomField::find($field_id)) {
$this->authorize('delete', $field); $this->authorize('delete', $field);
if ($field->fieldset->count()>0) { if (($field->fieldset) && ($field->fieldset->count() > 0)) {
return redirect()->back()->withErrors(['message' => "Field is in-use"]); return redirect()->back()->withErrors(['message' => "Field is in-use"]);
} }
$field->delete(); $field->delete();
@ -163,6 +163,9 @@ class CustomFieldsController extends Controller
->with("success", trans('admin/custom_fields/message.field.delete.success')); ->with("success", trans('admin/custom_fields/message.field.delete.success'));
} }
return redirect()->back()->withErrors(['message' => "Field does not exist"]);
}
/** /**
* Return a view to edit a custom field * Return a view to edit a custom field