From a356dbd73d77d378869ceefacf76501a73148056 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 22 Nov 2013 05:43:40 -0500 Subject: [PATCH] Change table display based on filters --- app/views/backend/assets/index.blade.php | 41 +++++++++++++++++------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/app/views/backend/assets/index.blade.php b/app/views/backend/assets/index.blade.php index 77dd2c8d3b..69f001cfad 100755 --- a/app/views/backend/assets/index.blade.php +++ b/app/views/backend/assets/index.blade.php @@ -40,8 +40,13 @@ Assets :: @lang('admin/assets/table.asset_tag') @lang('admin/assets/table.title') @lang('admin/assets/table.serial') + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) + Status + @else @lang('admin/assets/table.checkoutto') @lang('admin/assets/table.location') + @endif + @lang('admin/assets/table.change') @lang('table.actions') @@ -53,18 +58,32 @@ Assets :: {{ $asset->asset_tag }} {{ $asset->name }} {{ $asset->serial }} - - @if ($asset->assigneduser) - - {{ $asset->assigneduser->fullName() }} - + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) + + @if (Input::get('Pending')) + Pending + @elseif (Input::get('RTD')) + Ready to Deploy + @elseif (Input::get('Undeployable')) + Undeployable + @endif + + @else + + @if ($asset->assigneduser) + + {{ $asset->assigneduser->fullName() }} + + @endif + + + @if ($asset->assigneduser && $asset->assetloc) + {{ $asset->assetloc->name }} + @endif + + @endif - - - @if ($asset->assigneduser && $asset->assetloc) - {{ $asset->assetloc->name }} - @endif - + @if ($asset->assigned_to != 0) Checkin