lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed

Browse source 
Fixes log update action even if no changes are made to assets [sc-19131]
This commit is contained in:
snipe 2022-06-06 20:06:19 -07:00 • committed by GitHub
commit 7faaa4ce24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Observers/AssetObserver.php
View file

@ -26,7 +26,7 @@ class AssetObserver
&& ($attributes['checkout_counter'] == $attributesOriginal['checkout_counter']) && ($attributes['checkout_counter'] == $attributesOriginal['checkout_counter'])
&& ($attributes['checkin_counter'] == $attributesOriginal['checkin_counter']) && ($attributes['checkin_counter'] == $attributesOriginal['checkin_counter'])
&& ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null)) && ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
&& ($attributes['last_checkout'] == $attributesOriginal['last_checkout'])) && ($attributes['last_checkout'] == $attributesOriginal['last_checkout']))
{ {
$changed = []; $changed = [];
@ -35,7 +35,11 @@ class AssetObserver
$changed[$key]['old'] = $asset->getRawOriginal()[$key]; $changed[$key]['old'] = $asset->getRawOriginal()[$key];
$changed[$key]['new'] = $asset->getAttributes()[$key]; $changed[$key]['new'] = $asset->getAttributes()[$key];
} }
} }
if (empty($changed)){
return;
}
$logAction = new Actionlog(); $logAction = new Actionlog();
$logAction->item_type = Asset::class; $logAction->item_type = Asset::class;