Merge pull request #498 from snipe/fixes/477

Fixes #477 - wrong sidebar on asset view
snipe · Feb 9, 2015 · 7009b24 · 7009b24
2 parents 95ae26e + 389c27b
commit 7009b24
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
@@ -279,10 +279,13 @@
                         <li><i class="icon-phone"></i> {{{ $asset->assigneduser->phone }}}</li>
                     @endif
 
+
                     <li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">@lang('admin/hardware/general.checkin')</a></li>
                     </ul>
 
+
             @elseif (($asset->status_id ) && ($asset->status_id > 1))
+			<!-- Status ID is greater than 1, Asset is Undeployable-->
 
                 @if ($asset->assetstatus)
                     <h6><br>{{{ $asset->assetstatus->name }}}
@@ -297,16 +300,14 @@
                 </div>
                 @endif
 
+
             @elseif ($asset->status_id == NULL)
+            <!-- Status ID is NULL, Asset is pending-->
                     <h6><br>@lang('admin/hardware/general.pending')</h6>
-                    <div class="col-md-12">
-                    <div class="alert alert-info alert-block">
-                        <i class="icon-info-sign"></i>
-                        @lang('admin/hardware/message.undeployable')
-                    </div>
-                </div>
 
-            @else
+
+            @elseif ($asset->status_id == 0)
+            <!-- Status ID is 0, Asset is RTD -->
             <h6><br>@lang('admin/hardware/general.checkout')</h6>
                 <ul>
                     <li>This asset is not checked out to anyone yet. Use the button below to check it out now.</li>