Fixed bug in expected checkin

This commit is contained in:
snipe
2015-08-17 11:14:01 -07:00
parent 21bb2f8b44
commit 94e8b5f783
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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',
);
+1 -1
View File
@@ -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>