DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added comments

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-05-15 17:38:42 +01:00
parent 72c85f93b6
commit c7accb4599
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/Api/AssetsController.php
View file

@ -1036,7 +1036,7 @@ class AssetsController extends Controller
$settings = Setting::getSettings();
$dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
// No tag passed
// No tag passed - return an error
if (!$request->filled('asset_tag')) {
return response()->json(Helper::formatStandardApiResponse('error', [
'asset_tag'=> '',
@ -1049,7 +1049,18 @@ class AssetsController extends Controller
if ($asset) {
// We don't want to log this as a normal update, so let's bypass that
/**
* We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
* otherwise the audit will create an action_log entry and so will be saving of the asset model
* with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
* normal model-level validation that's usually handled at the observer )
*
* We handle validation on the save by checking if the asset is valid via the ->isValid() method,
* which manually invokes Watson Validating to make sure the asset's model is valid.
*
* @see App\Observers\AssetObserver::updating()
*/
$asset->unsetEventDispatcher();
$asset->next_audit_date = $dt;
@ -1065,9 +1076,12 @@ class AssetsController extends Controller
$asset->last_audit_date = date('Y-m-d H:i:s');
// Asset is valid and the save was successful
/**
* Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
* We have to invoke this manually because of the unsetEventDispatcher() above.)
*/
if ($asset->isValid() && $asset->save()) {
$log = $asset->logAudit(request('note'), request('location_id'));
$asset->logAudit(request('note'), request('location_id'));
return response()->json(Helper::formatStandardApiResponse('success', [
'asset_tag'=> e($asset->asset_tag),

16
app/Http/Controllers/Assets/AssetsController.php
View file

@ -880,7 +880,17 @@ class AssetsController extends Controller
$asset = Asset::findOrFail($id);
// We don't want to log this as a normal update, so let's bypass that
/**
* We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
* otherwise the audit will create an action_log entry and so will be saving of the asset model
* with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
* normal model-level validation that's usually handled at the observer )
*
* We handle validation on the save by checking if the asset is valid via the ->isValid() method,
* which manually invokes Watson Validating to make sure the asset's model is valid.
*
* @see \App\Observers\AssetObserver::updating()
*/
$asset->unsetEventDispatcher();
$asset->next_audit_date = $request->input('next_audit_date');
@ -893,6 +903,10 @@ class AssetsController extends Controller
}
/**
* Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
* We have to invoke this manually because of the unsetEventDispatcher() above.)
*/
if ($asset->isValid() && $asset->save()) {
// Create the image (if one was chosen.)