From 52ef9280ba57fecac417b10f5ce3bd7a2284c163 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 28 Oct 2021 15:15:54 -0700 Subject: [PATCH] Adds reqestable as model bulk edit field Signed-off-by: snipe --- .../Controllers/BulkAssetModelsController.php | 5 +++++ app/Presenters/AssetModelPresenter.php | 8 ++++++++ resources/views/models/bulk-edit.blade.php | 19 ++++++++++++++++++- resources/views/users/bulk-edit.blade.php | 4 ++-- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/BulkAssetModelsController.php b/app/Http/Controllers/BulkAssetModelsController.php index 19cd7f11d8..acb8e30b70 100644 --- a/app/Http/Controllers/BulkAssetModelsController.php +++ b/app/Http/Controllers/BulkAssetModelsController.php @@ -80,6 +80,11 @@ class BulkAssetModelsController extends Controller $update_array['depreciation_id'] = $request->input('depreciation_id'); } + if ($request->filled('requestable') != '') { + $update_array['requestable'] = $request->input('requestable'); + } + + if (count($update_array) > 0) { AssetModel::whereIn('id', $models_raw_array)->update($update_array); diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php index 08fec15200..78e0776ac4 100644 --- a/app/Presenters/AssetModelPresenter.php +++ b/app/Presenters/AssetModelPresenter.php @@ -106,6 +106,14 @@ class AssetModelPresenter extends Presenter 'visible' => true, 'formatter' => 'fieldsetsLinkObjFormatter', ], + [ + 'field' => 'requestable', + 'searchable' => false, + 'sortable' => true, + 'visible' => false, + 'title' => trans('admin/hardware/general.requestable'), + 'formatter' => 'trueFalseFormatter', + ], [ 'field' => 'notes', 'searchable' => true, diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php index 5e4866564e..392441898d 100644 --- a/resources/views/models/bulk-edit.blade.php +++ b/resources/views/models/bulk-edit.blade.php @@ -72,13 +72,30 @@ + +
+
+ + +
+ +
+ +
+
+ @foreach ($models as $model) @endforeach - diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index 4916287dd9..991c647020 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -73,7 +73,7 @@
@@ -113,7 +113,7 @@ @endforeach
-