diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index f0a23eb07c..a399e1d2a6 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -19,12 +19,21 @@ class AssetObserver { $attributes = $asset->getAttributes(); $attributesOriginal = $asset->getRawOriginal(); + $same_checkout_counter = false; + $same_checkin_counter = false; + + if (array_key_exists('checkout_counter', $attributes) && array_key_exists('checkout_counter', $attributesOriginal)){ + $same_checkout_counter = (($attributes['checkout_counter'] == $attributesOriginal['checkout_counter'])); + } + + if (array_key_exists('checkin_counter', $attributes) && array_key_exists('checkin_counter', $attributesOriginal)){ + $same_checkin_counter = (($attributes['checkin_counter'] == $attributesOriginal['checkin_counter'])); + } // If the asset isn't being checked out or audited, log the update. // (Those other actions already create log entries.) if (($attributes['assigned_to'] == $attributesOriginal['assigned_to']) - && ($attributes['checkout_counter'] == $attributesOriginal['checkout_counter']) - && ($attributes['checkin_counter'] == $attributesOriginal['checkin_counter']) + && ($same_checkout_counter) && ($same_checkin_counter) && ((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'])) {