From efddda8665e2c20f60dde40ca23294fa76506957 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 23 Oct 2015 18:28:06 -0700
Subject: [PATCH] Fixed expected_checkin error on asset view

---
 app/config/version.php                     | 4 ++--
 app/controllers/admin/AssetsController.php | 3 +++
 app/views/backend/hardware/view.blade.php  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/config/version.php b/app/config/version.php
index 51f66ab1d6..90fafb3258 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-347',
-  'hash_version' => 'v2.0-347-g8a1ffb9',
+  'app_version' => 'v2.0-348',
+  'hash_version' => 'v2.0-348-geb13354',
 );
\ No newline at end of file
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
index e9601468b7..61c1a9321c 100755
--- a/app/controllers/admin/AssetsController.php
+++ b/app/controllers/admin/AssetsController.php
@@ -1141,6 +1141,9 @@ class AssetsController extends AdminController
         case 'category':
             $assets = $assets->OrderCategory($order);
             break;
+        case 'status':
+            $assets = $assets->OrderCategory($order);
+           break;
         default:
             $assets = $assets->orderBy($sort, $order);
             break;
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
index e8ac91c01f..fb2bc14fcf 100755
--- a/app/views/backend/hardware/view.blade.php
+++ b/app/views/backend/hardware/view.blade.php
@@ -162,10 +162,10 @@
             </div>
         @endif
 
-        @if ($asset->assetlog->first()->expected_checkin)
+        @if ($asset->expected_checkin!='')
             <div class="col-md-12" style="padding-bottom: 5px;">
                   <strong>@lang('admin/hardware/form.expected_checkin')</strong>
-               : {{{ $asset->assetlog->first()->expected_checkin }}}
+               : {{{ $asset->expected_checkin }}}
             </div>
        @endif