From 20ad4fb681e128a6f2f73ec4e3c558473da1bb18 Mon Sep 17 00:00:00 2001 From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com> Date: Wed, 23 Nov 2022 18:42:38 +0100 Subject: [PATCH 1/2] Update CategoryPresenter.php Fix snipe#12153 --- app/Presenters/CategoryPresenter.php | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index 92905a68e3..43422bd0e3 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -70,39 +70,33 @@ class CategoryPresenter extends Presenter 'visible' => true, 'formatter' => 'trueFalseFormatter', ], [ - 'field' => 'actions', - 'searchable' => false, - 'sortable' => false, - 'switchable' => false, - 'title' => trans('table.actions'), - ],[ "field" => "use_default_eula", "searchable" => false, "sortable" => true, "title" => trans('admin/categories/general.use_default_eula_column'), 'visible' => true, "formatter" => 'trueFalseFormatter', - ],[ - "field" => "require_acceptance", - "searchable" => false, - "sortable" => true, - 'formatter' => 'categoriesActionsFormatter', - ], - [ + ], [ 'field' => 'created_at', 'searchable' => true, 'sortable' => true, 'visible' => false, 'title' => trans('general.created_at'), 'formatter' => 'dateDisplayFormatter', - ], - [ + ], [ 'field' => 'updated_at', 'searchable' => true, 'sortable' => true, 'visible' => false, 'title' => trans('general.updated_at'), 'formatter' => 'dateDisplayFormatter', + ], [ + 'field' => 'actions', + 'searchable' => false, + 'sortable' => false, + 'switchable' => false, + 'title' => trans('table.actions'), + 'formatter' => 'categoriesActionsFormatter', ], ]; From c2cfd8ff5377174a48dd73d304d76d568f4aa504 Mon Sep 17 00:00:00 2001 From: Robert-Azelis <82208283+Robert-Azelis@users.noreply.github.com> Date: Wed, 23 Nov 2022 19:00:08 +0100 Subject: [PATCH 2/2] Update CategoryPresenter.php --- app/Presenters/CategoryPresenter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index 43422bd0e3..e9276a3417 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -96,7 +96,7 @@ class CategoryPresenter extends Presenter 'sortable' => false, 'switchable' => false, 'title' => trans('table.actions'), - 'formatter' => 'categoriesActionsFormatter', + 'formatter' => 'categoriesActionsFormatter', ], ];