From e9fdf06bf61ccd39693130242e9ccfea28e02975 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 30 Nov 2017 16:40:37 -0800 Subject: [PATCH] Improved display of asset status and meta status --- resources/views/hardware/view.blade.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 2dece57b15..a55de38396 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -82,13 +82,23 @@ {{ trans('general.status') }} - @if ($asset->assetstatus->color) - -     - + + @if (($asset->assignedTo) && ($asset->deleted_at=='')) + {{ trans('general.deployed') }} {!! $asset->assignedTo->present()->glyph() !!} + {!! $asset->assignedTo->present()->nameUrl() !!} + @else + @if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1')) + + @elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1')) + + @elseif (($asset->assetstatus) && ($asset->assetstatus->archived=='1')) + + @endif + + {{ $asset->assetstatus->name }} + + @endif - {{ $asset->assetstatus->name }} - @endif