DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Skip model check for custom fields change

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2023-11-13 16:31:27 +00:00
parent 9e1cfac995
commit 41fd717d6a
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Controllers/Assets/BulkAssetsController.php
View file

@ -130,12 +130,7 @@ class BulkAssetsController extends Controller
}
$assets = array_keys($request->input('ids'));
if ($request->anyFilled($custom_field_columns)) {
$custom_fields_present = true;
} else {
$custom_fields_present = false;
}
if (($request->filled('purchase_date'))
|| ($request->filled('expected_checkin'))
|| ($request->filled('purchase_cost'))
@ -154,6 +149,7 @@ class BulkAssetsController extends Controller
|| ($request->anyFilled($custom_field_columns))
) {
foreach ($assets as $assetId) {
$this->update_array = [];
@ -216,9 +212,7 @@ class BulkAssetsController extends Controller
$changed[$key]['new'] = $this->update_array[$key];
}
}
if ($custom_fields_present) {
$model = $asset->model()->first();
// Use the rules of the new model fieldsets if the model changed
@ -274,8 +268,6 @@ class BulkAssetsController extends Controller
} // endforeach
} // end custom field check
} // end custom fields handler
// Check if it passes validation, and then try to save