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

Updated comments again :-/

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-05-15 17:52:50 +01:00
parent c7accb4599
commit cb22a3d556
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1051,15 +1051,19 @@ class AssetsController extends Controller
if ($asset) {
/**
* 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 )
* Even though we do a save() further down, we don't want to log this as a "normal" asset update,
* which would trigger the Asset Observer and would log an asset *update* log entry (because the
* de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
* the audit log entry we're creating through this controller.
*
* We handle validation on the save by checking if the asset is valid via the ->isValid() method,
* To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
* that de-normed update log entry by using unsetEventDispatcher(), 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()
* @see \App\Observers\AssetObserver::updating()
*/
$asset->unsetEventDispatcher();
$asset->next_audit_date = $dt;

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

@ -881,12 +881,16 @@ class AssetsController extends Controller
$asset = Asset::findOrFail($id);
/**
* 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 )
* Even though we do a save() further down, we don't want to log this as a "normal" asset update,
* which would trigger the Asset Observer and would log an asset *update* log entry (because the
* de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
* the audit log entry we're creating through this controller.
*
* We handle validation on the save by checking if the asset is valid via the ->isValid() method,
* To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
* that de-normed update log entry by using unsetEventDispatcher(), 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()