From cd333fa93bc0f7fdc06ee51e24f801ebf3e66b35 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 13 Feb 2019 06:52:36 -0800
Subject: [PATCH] Fixed wonky merge :(

---
 app/Http/Controllers/Api/AssetsController.php    | 2 +-
 app/Http/Controllers/Assets/AssetsController.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 8cae0e3db..47083f5fe 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -362,7 +362,7 @@ class AssetsController extends Controller
             'assets.assigned_to',
             'assets.assigned_type',
             'assets.status_id'
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
+            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(), 'company_id', 'assets');
 
         if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
             $assets = $assets->RTD();
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index acf259603..399aa2c60 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -156,8 +156,9 @@ class AssetsController extends Controller
             $image = $request->input('image');
 
 
-            $asset->asset_tag  = $asset_tags[$a];
+            $asset->asset_tag = $asset_tags[$a];
             $asset = $request->handleImages($asset);
+        }
 
 
             // Update custom fields in the database.