From 932e25ca9b5cb5ad0aebd14b5aa41434d6806445 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sat, 8 Jul 2017 03:38:39 -0700
Subject: [PATCH] =?UTF-8?q?Only=20add=20an=20update=20log=20message=20if?=
 =?UTF-8?q?=20the=20asset=20isn=E2=80=99t=20being=20checked=20in=20or=20ou?=
 =?UTF-8?q?t?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/AssetsController.php |  4 ++--
 app/Models/Asset.php                      |  2 ++
 app/Observers/AssetObserver.php           | 21 ++++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index 7ea4d1b1e2..498fbbe495 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -587,9 +587,9 @@ class AssetsController extends Controller
         $settings = Setting::getSettings();
         $this->authorize('view', $asset);
 
-        if (isset($asset->id)) {
+        if (isset($asset)) {
 
-            if ($asset->assetloc) {
+            if (!is_null($asset->assetloc)) {
                 $use_currency = $asset->assetloc->currency;
             } else {
 
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index bf4d89e41e..5835ac4d8d 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -278,6 +278,8 @@ class Asset extends Depreciable
                 return $this->assignedTo->assetloc(); // Recurse until we have a final location
             } elseif ($this->assignedType() == self::LOCATION) {
                 return $this->assignedTo();
+            } elseif (!$this->assignedTo) {
+                return $this->defaultLoc();
             } elseif ($this->assignedType() == self::USER) {
                 return $this->assignedTo->userLoc();
             }
diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php
index 85a5a1f1b9..2046f0e335 100644
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -15,14 +15,21 @@ class AssetObserver
      * @param  Asset  $asset
      * @return void
      */
-    public function updated(Asset $asset)
+    public function updating(Asset $asset)
     {
-        $logAction = new Actionlog();
-        $logAction->item_type = Asset::class;
-        $logAction->item_id = $asset->id;
-        $logAction->created_at =  date("Y-m-d H:i:s");
-        $logAction->user_id = Auth::id();
-        $logAction->logaction('update');
+
+        if (($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
+            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])
+            && ($asset->getAttributes()['status_id'] == $asset->getOriginal()['status_id']))
+        {
+            $logAction = new Actionlog();
+            $logAction->item_type = Asset::class;
+            $logAction->item_id = $asset->id;
+            $logAction->created_at =  date("Y-m-d H:i:s");
+            $logAction->user_id = Auth::id();
+            $logAction->logaction('update');
+        }
+
     }