From f977c53ecb9b0b57a153251826d7f4c05d00a640 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Mon, 6 Jun 2022 19:14:32 -0500 Subject: [PATCH] Fixes some issues in the asset observer --- app/Observers/AssetObserver.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index 78fd4c451..6d9f37c31 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -18,19 +18,21 @@ class AssetObserver public function updating(Asset $asset) { $attributes = $asset->getAttributes(); - $attributesOriginal = $asset->getOriginal(); - + $attributesOriginal = $asset->getRawOriginal(); + // 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']) + if (($attributes['assigned_to'] == $attributesOriginal['assigned_to']) + && ($attributes['checkout_counter'] == $attributesOriginal['checkout_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)) && ($attributes['last_checkout'] == $attributesOriginal['last_checkout'])) { $changed = []; - foreach ($asset->getOriginal() as $key => $value) { - if ($asset->getOriginal()[$key] != $asset->getAttributes()[$key]) { - $changed[$key]['old'] = $asset->getOriginal()[$key]; + foreach ($asset->getRawOriginal() as $key => $value) { + if ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key]) { + $changed[$key]['old'] = $asset->getRawOriginal()[$key]; $changed[$key]['new'] = $asset->getAttributes()[$key]; } }