diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 5bc65d0205..29748b9c22 100644 --- a/app/Http/Controllers/Api/StatuslabelsController.php +++ b/app/Http/Controllers/Api/StatuslabelsController.php @@ -22,7 +22,7 @@ class StatuslabelsController extends Controller public function index(Request $request) { $this->authorize('view', Statuslabel::class); - $allowed_columns = ['id','name','created_at', 'assets_count']; + $allowed_columns = ['id','name','created_at', 'assets_count','color']; $statuslabels = Statuslabel::withCount('assets'); diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index d048243d09..edb64ceebb 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -26,11 +26,13 @@ data-pagination="true" data-id-table="statuslabelsTable" data-search="true" + data-show-footer="false" data-side-pagination="server" data-show-columns="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" + data-sort-name="name" id="statuslabelsTable" class="table table-striped snipe-table" data-url="{{ route('api.statuslabels.index') }}" @@ -44,9 +46,9 @@ {{ trans('admin/statuslabels/table.name') }} {{ trans('admin/statuslabels/table.status_type') }} {{ trans('general.assets') }} - {{ trans('admin/statuslabels/table.color') }} + {{ trans('admin/statuslabels/table.color') }} {{ trans('admin/statuslabels/table.show_in_nav') }} - {{ trans('table.actions') }} + {{ trans('table.actions') }}