From d49b67d0332195caf685e580494d58fdb100f5be Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 25 Sep 2017 11:26:04 -0700
Subject: [PATCH 1/2] Fix for assigned user location

Was breaking requestable page
---
 app/Models/Asset.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 51ba984948..bf92e2f977 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -262,11 +262,12 @@ class Asset extends Depreciable
                 return $this->assignedTo();
             }
             if ($this->assignedType() == self::USER) {
+                if (!$this->assignedTo) {
+                    return $this->defaultLoc();
+                }
                 return $this->assignedTo->userLoc();
             }
-            if (!$this->assignedTo) {
-                return $this->defaultLoc();
-            }
+
         }
         return $this->defaultLoc();
     }

From 865950e766e72c913a462cdbef4a8be26be18e20 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 25 Sep 2017 11:53:10 -0700
Subject: [PATCH 2/2] Fixes #4000 - user_id blank

---
 app/Http/Controllers/AssetModelsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 1d66b55fca..09cf23a052 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -82,7 +82,7 @@ class AssetModelsController extends Controller
         $model->manufacturer_id     = $request->input('manufacturer_id');
         $model->category_id         = $request->input('category_id');
         $model->notes               = $request->input('notes');
-        $model->user_id             = Auth::guard('api')->user();
+        $model->user_id             = Auth::id();
         $model->requestable         = Input::has('requestable');
 
         if ($request->input('custom_fieldset')!='') {