diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 750174e3b5..5a5ca0999c 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -84,6 +84,10 @@ class AssetsController extends Controller $assets->TextSearch($request->input('search')); } + if ($request->has('status_id')) { + $assets->where('status_id', '=', $request->input('status_id')); + } + if ($request->has('model_id')) { $assets->InModelList([$request->input('model_id')]); } diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index d55bde038c..ad9fc83544 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -30,7 +30,7 @@ {{ trans('general.id') }} - {{ trans('admin/statuslabels/table.name') }} + {{ trans('admin/statuslabels/table.name') }} {{ trans('admin/statuslabels/table.status_type') }} {{ trans('admin/statuslabels/table.color') }} {{ trans('admin/statuslabels/table.show_in_nav') }} @@ -61,6 +61,12 @@ } } + function statuslabelsAssetLinkFormatter(value, row) { + if ((row) && (row.name)) { + return ' ' + row.name + ''; + } + } + function undeployableFormatter(value, row) { if ((value) && (value!='deployable')) { return '' + value + ' '; diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php deleted file mode 100644 index 8bf7cf2819..0000000000 --- a/resources/views/statuslabels/view.blade.php +++ /dev/null @@ -1,102 +0,0 @@ -@extends('layouts/default') - -{{-- Page title --}} -@section('title') - {{ $statuslabel->name }} Assets ({{ $statuslabel->getStatuslabelType() }}) - @parent -@stop - -@section('header_right') - - {{ trans('general.create') }} -@stop -{{-- Page content --}} -@section('content') -
-
-
-
- {{ Form::open([ - 'method' => 'POST', - 'route' => ['hardware/bulkedit'], - 'class' => 'form-inline', - 'id' => 'bulkForm']) }} -
-
- @if (Input::get('status')!='Deleted') -
- - -
- @endif - - - - - @if (Input::get('status')!='Deleted') - - @endif - - - - - - - - - - - - - - - - - - - - - @foreach(\App\Models\CustomField::all() AS $field) - - - - - @endforeach - - - - - - -
{{ trans('general.id') }}{{ trans('general.company') }}{{ trans('admin/hardware/table.image') }}{{ trans('admin/hardware/form.name') }}{{ trans('admin/hardware/table.asset_tag') }}{{ trans('admin/hardware/table.serial') }}{{ trans('admin/hardware/form.model') }}{{ trans('admin/models/table.modelnumber') }}{{ trans('admin/hardware/form.checkedout_to') }}{{ trans('admin/hardware/table.location') }}{{ trans('general.category') }}{{ trans('general.manufacturer') }}{{ trans('admin/hardware/form.cost') }}{{ trans('admin/hardware/form.date') }}{{ trans('general.eol') }}{{ trans('general.notes') }}{{ trans('admin/hardware/form.order') }}{{ trans('admin/hardware/table.checkout_date') }}{{ trans('admin/hardware/form.expected_checkin') }} - @if ($field->field_encrypted=='1') - - @endif - - {{$field->name}} - {{ trans('general.created_at') }}{{ trans('admin/hardware/table.change') }}{{ trans('table.actions') }}
-
-
- {{ Form::close() }} -
-
-
-
-@stop - -@section('moar_scripts') - @include ('partials.bootstrap-table', ['exportFile' => 'statuslabels-export', 'search' => true]) -@stop