Fixed bug in expected checkin

snipe · Aug 17, 2015 · 94e8b5f · 94e8b5f
1 parent 21bb2f8
commit 94e8b5f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
   'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta2-2-g7dd50ed',
+  'hash_version' => 'v2.0-pre-beta2-4-gaae7d45',
 );
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
@@ -435,7 +435,7 @@
                         @endif
                     <ul>
 
-                    	 @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
+                    	 @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at=='') && ($asset->assetlog->first()))
                     	 	@if ($asset->assetlog->first()->expected_checkin)
                                 <li><br />@lang('admin/hardware/form.expected_checkin')
                                     : {{{ date('Y-m-d', strtotime($asset->assetlog->first()->expected_checkin)) }}}</li>