From 91694064fb65baa1ff5eef9227a6e11c573a15a4 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 18 Apr 2022 11:30:24 -0700 Subject: [PATCH] fixes double updates from action log and history --- app/Observers/AssetObserver.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index 164792a3a9..9dc9f2d083 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -17,12 +17,13 @@ class AssetObserver */ public function updating(Asset $asset) { - - // If the asset isn't being checked out or audited, log the update. - // (Those other actions already create log entries.) - if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to']) - && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date']) - && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])) + $attributes = $asset->getAttributes(); + $attributesOriginal = $asset->getOriginal(); +// 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']) + && ((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 = [];