Fixed missing checkedout-to info on asset view

snipe · Feb 18, 2015 · 30df21c · 30df21c
1 parent 6bc1524
commit 30df21c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
@@ -326,8 +326,9 @@
                 <img src="{{{ $qr_code->url }}}" />
             </p>
             @endif
-
-            @if ((isset($asset->assigneduser) && ($asset->assigned_to > 0)) && ($asset->deleted_at==''))
+
+
+            @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
                 <h6><br>@lang('admin/hardware/form.checkedout_to')</h6>
                 <ul>
 
@@ -355,7 +356,6 @@
                     @endif
 
 
-                    <li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">@lang('admin/hardware/general.checkin')</a></li>
                     </ul>
 
 			 @endif
@@ -368,6 +368,7 @@
                     @lang('admin/hardware/general.asset')</h6>
 
                     <ul>
+
                     	 @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0) && ($asset->deleted_at==''))
                     	<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">@lang('admin/hardware/general.checkin')</a></li>
                     	@elseif ((($asset->assetstatus->deployable=='1') &&  (($asset->assigned_to=='') || ($asset->assigned_to==0))) && ($asset->deleted_at==''))