From 3ea3e8b8565808c8b657a96c314b9ec51ddeff2d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Sep 2020 15:12:51 -0700 Subject: [PATCH] Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389] --- resources/views/users/view.blade.php | 79 ++++++++-------------------- 1 file changed, 23 insertions(+), 56 deletions(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index aceb96f6b..c5275b0c1 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -366,62 +366,29 @@
-
- - - - - - - - - - - @if ($user->assets) - @foreach ($user->assets as $asset) - - - - - - - @if($settings->show_assigned_assets) - @foreach ($asset->assignedAssets as $asset) - - - - - - - @endforeach - @endif - @endforeach - @endif - +
+
{{ trans('admin/hardware/table.asset_model') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('general.name') }}{{ trans('general.action') }}
- @if (($asset->model) && ($asset->physical=='1')) - {{ $asset->model->name }} - @endif - - @can('view', $asset) - {{ $asset->asset_tag }} - @endcan - {!! $asset->present()->nameUrl() !!} - @can('checkin', $asset) - {{ trans('general.checkin') }} - @endcan -
- @if ($asset->physical=='1') - {{ ' – '.$asset->model->name }} - @endif - - @can('view', $asset) - {{ $asset->asset_tag }} - @endcan - {!! $asset->present()->nameUrl() !!} - @can('checkin', $asset) - {{ trans('general.checkin') }} - @endcan -