From a4fd0c9c6dbf1aa3af1f8127d718732221286687 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 28 Jun 2021 11:52:57 -0700
Subject: [PATCH] Fixed #9745 - added searchable, sortable notes field to
status labels
Signed-off-by: snipe <snipe@snipe.net>
---
app/Http/Controllers/Api/StatuslabelsController.php | 2 +-
resources/views/statuslabels/index.blade.php | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 0e5b6cb53..774fb7001 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','color','default_label'];
+ $allowed_columns = ['id','name','created_at', 'assets_count','color', 'notes','default_label'];
$statuslabels = Statuslabel::withCount('assets as assets_count');
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index 39c7ce2a1..f69f69cd0 100755
--- a/resources/views/statuslabels/index.blade.php
+++ b/resources/views/statuslabels/index.blade.php
@@ -53,6 +53,7 @@
<th data-sortable="true" data-field="color" data-formatter="colorSqFormatter">{{ trans('admin/statuslabels/table.color') }}</th>
<th class="text-center" data-sortable="true" data-field="show_in_nav" data-formatter="trueFalseFormatter">{{ trans('admin/statuslabels/table.show_in_nav') }}</th>
<th class="text-center" data-sortable="true" data-field="default_label" data-formatter="trueFalseFormatter">{{ trans('admin/statuslabels/table.default_label') }}</th>
+ <th data-sortable="true" data-field="notes">{{ trans('general.notes') }}</th>
<th data-formatter="statuslabelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
</tr>
</thead>
--
GitLab