From a016f4ecd00a13b6d31837648ebbe1f9faadac16 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Mon, 28 Jun 2021 13:11:22 -0700
Subject: [PATCH] Applies PR #9761 to integration

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/StatuslabelsController.php | 2 +-
 app/Models/Statuslabel.php                          | 2 +-
 resources/views/statuslabels/index.blade.php        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php
index 0e9940ffec..f3d1deabde 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/app/Models/Statuslabel.php b/app/Models/Statuslabel.php
index ee824734e5..da856b4b7f 100755
--- a/app/Models/Statuslabel.php
+++ b/app/Models/Statuslabel.php
@@ -43,7 +43,7 @@ class Statuslabel extends SnipeModel
      *
      * @var array
      */
-    protected $searchableAttributes = ['name'];
+    protected $searchableAttributes = ['name', 'notes'];
 
     /**
      * The relations and their attributes that should be included when searching the model.
diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php
index 39c7ce2a19..1590ac3b57 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" data-visible="false">{{ trans('general.notes') }}</th>
                 <th data-formatter="statuslabelsActionsFormatter" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
               </tr>
             </thead>