From c64ca76b3dbfd78ecdcae0881c2c7785a5fb98a6 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 25 Jul 2017 01:16:31 -0700 Subject: [PATCH] Fixes API route --- resources/views/reports/asset.blade.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/views/reports/asset.blade.php b/resources/views/reports/asset.blade.php index d49b974d8a..07cf67a98f 100644 --- a/resources/views/reports/asset.blade.php +++ b/resources/views/reports/asset.blade.php @@ -25,7 +25,7 @@ data-toolbar="#toolbar" class="table table-striped snipe-table" id="table" - data-url="{{route('api.hardware.list', array(''=>e(Input::get('status')),'order_number'=>e(Input::get('order_number')), 'status_id'=>e(Input::get('status_id')), 'report'=>'true'))}}" + data-url="{{route('api.assets.index', array(''=>e(Input::get('status')),'order_number'=>e(Input::get('order_number')), 'status_id'=>e(Input::get('status_id')), 'report'=>'true'))}}" data-cookie="true" data-click-to-select="true" data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.hash_version') }}"> @@ -43,6 +43,7 @@ {{ trans('admin/models/table.modelnumber') }} {{ trans('admin/hardware/table.status') }} {{ trans('admin/hardware/form.checkedout_to') }} + {{ trans('admin/users/table.employee_num') }} {{ trans('admin/hardware/table.location') }} {{ trans('general.category') }} {{ trans('general.manufacturer') }} @@ -77,8 +78,14 @@ @stop -@section('moar_scripts') -@include ('partials.bootstrap-table', ['exportFile' => 'assets-export', 'search' => true, 'multiSort' => true]) +@section('moar_scripts') + @include ('partials.bootstrap-table', [ + 'exportFile' => 'assets-export', + 'multiSort' => true, + 'search' => true, + 'columns' => \App\Presenters\AssetPresenter::dataTableLayout() + ]) + @stop