DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add error message when the default customfield values can't be validated

Browse source
This commit is contained in:
Ivan Nieto Vivanco 2022-06-22 22:17:05 -05:00
parent 7e10abe605
commit 7976401aa2
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/AssetModelsController.php
View file

@ -92,7 +92,7 @@ class AssetModelsController extends Controller
if ($model->save()) {
if ($this->shouldAddDefaultValues($request->input())) {
if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
return redirect()->back()->withInput()->withErrors($model->getErrors());
return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
}
}
@ -167,7 +167,7 @@ class AssetModelsController extends Controller
if ($this->shouldAddDefaultValues($request->input())) {
if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
return redirect()->back()->withInput()->withErrors("Error");
return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
}
}
}

6
resources/lang/en/admin/custom_fields/message.php
View file

@ -49,6 +49,12 @@ return array(
),
'fieldset_default_value' => array(
'error' => 'Error validating default fieldset values.',
),