diff --git a/app/Http/Controllers/Api/StatuslabelsController.php b/app/Http/Controllers/Api/StatuslabelsController.php index 0e5b6cb53639a1dd381580e973fbc83d56fe452c..774fb700146307e76ea63801d466da133148ea8e 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 cd4672b8412459a740ffefe0303126e9416ab179..fc252af714bfa7db71b044444e9b102cf1eb9d69 100755 --- a/app/Models/Statuslabel.php +++ b/app/Models/Statuslabel.php @@ -41,7 +41,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 39c7ce2a1984bf996d5bc6525d7c97a2015a05eb..1590ac3b579d85cfee0d105a9f06426886662049 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>