From 9a358087ec4c899830de2ba02cb45b12212ec66c Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 4 Mar 2022 06:47:23 -0800 Subject: [PATCH] Add remote user to bulk edit Signed-off-by: snipe --- .../Controllers/Users/BulkUsersController.php | 2 ++ resources/lang/en/admin/users/general.php | 3 ++- resources/views/users/bulk-edit.blade.php | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 4d4adee61b..997eca55bb 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -90,7 +90,9 @@ class BulkUsersController extends Controller ->conditionallyAddItem('department_id') ->conditionallyAddItem('company_id') ->conditionallyAddItem('locale') + ->conditionallyAddItem('remote') ->conditionallyAddItem('activated'); + // If the manager_id is one of the users being updated, generate a warning. if (array_search($request->input('manager_id'), $user_raw_array)) { $manager_conflict = true; diff --git a/resources/lang/en/admin/users/general.php b/resources/lang/en/admin/users/general.php index dfefcbe1a1..46949dcc8d 100644 --- a/resources/lang/en/admin/users/general.php +++ b/resources/lang/en/admin/users/general.php @@ -36,5 +36,6 @@ return [ 'checkin_user_properties' => 'Check in all properties associated with these users', 'remote_label' => 'This is a remote user', 'remote' => 'Remote', - 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.' + 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', + 'not_remote_label' => 'This is not a remote user', ]; diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index f38a117a3d..e743356f2e 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -63,6 +63,23 @@ + +
+
+ {{ trans('admin/users/general.remote') }} +
+
+
+ +
+
+
+