From bd80a77b7801d7686d56b20ccbf45cfeaff5f973 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jan 2018 14:23:12 -0800
Subject: [PATCH 1/4] Added default location to asset listing

---
 app/Presenters/AssetPresenter.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index b8ca796d2..b011ee15f 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -113,7 +113,14 @@ class AssetPresenter extends Presenter
                 "title" => trans('admin/hardware/table.location'),
                 "visible" => true,
                 "formatter" => "deployedLocationFormatter"
-            ],  [
+            ], [
+                "field" => "rtd_location",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('admin/hardware/form.default_location'),
+                "visible" => false,
+                "formatter" => "deployedLocationFormatter"
+            ], [
                 "field" => "manufacturer",
                 "searchable" => true,
                 "sortable" => true,

From eddcc0fbbd286e35869534473e47e6026b986bde Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jan 2018 14:23:19 -0800
Subject: [PATCH 2/4] Fixed cookie issue on hardware

---
 resources/views/hardware/index.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php
index 4133187e5..412cd6c52 100755
--- a/resources/views/hardware/index.blade.php
+++ b/resources/views/hardware/index.blade.php
@@ -80,6 +80,7 @@
               id="table"
               data-advanced-search="true"
               data-show-export="true"
+              data-cookie="true" 
               data-id-table="advancedTable"
               data-url="{{ route('api.assets.index',
                   array('status' => e(Input::get('status')),

From 1d04897b3293f3737d397c9646a08f1a136d65b4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 24 Jan 2018 14:27:12 -0800
Subject: [PATCH 3/4] Order by default location

---
 app/Http/Controllers/Api/AssetsController.php |  2 ++
 app/Models/Asset.php                          | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 4f1716bd5..707668d6d 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -244,6 +244,8 @@ class AssetsController extends Controller
                 break;
             case 'location':
                 $assets->OrderLocation($order);
+            case 'rtd_location':
+                $assets->OrderRtdLocation($order);
                 break;
             case 'status_label':
                 $assets->OrderStatus($order);
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 1c6ad8fcb..56fd9fc60 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1162,6 +1162,18 @@ class Asset extends Depreciable
         return $query->leftJoin('locations as asset_locations', 'asset_locations.id', '=', 'assets.location_id')->orderBy('asset_locations.name', $order);
     }
 
+    /**
+     * Query builder scope to order on default
+     * @param  \Illuminate\Database\Query\Builder  $query  Query builder instance
+     * @param  text                              $order       Order
+     *
+     * @return \Illuminate\Database\Query\Builder          Modified query builder
+     */
+    public function scopeOrderRtdLocation($query, $order)
+    {
+        return $query->leftJoin('locations as rtd_asset_locations', 'rtd_asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('rtd_asset_locations.name', $order);
+    }
+
 
     /**
      * Query builder scope to order on supplier name

From 11505d5d06c757cc101cf728597edf4318a9ab87 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 25 Jan 2018 00:25:43 -0800
Subject: [PATCH 4/4] Fix crash if no asset model
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(This should never happen, but shouldn’t crash if/when it does)
---
 app/Http/Controllers/ReportsController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 834aa91db..c8ce28f0c 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -624,7 +624,7 @@ class ReportsController extends Controller
                     }
 
                     if ($request->has('category')) {
-                        $row[] = ($asset->model->category) ? $asset->model->category->name : '';
+                        $row[] = (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '';
                     }
 
                     if ($request->has('manufacturer')) {