From 891009dc672c68c10d3a0c1b5bfdaf725fb40df3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 18 May 2022 15:35:57 -0700
Subject: [PATCH] Nicer formatting for buttons in bulk user edit

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Users/BulkUsersController.php |  5 ++-
 resources/lang/en/general.php                 |  1 +
 resources/views/users/bulk-edit.blade.php     | 37 +++++++++++++++----
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php
index 6bf52a114a..3be8a06369 100644
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -91,7 +91,10 @@ class BulkUsersController extends Controller
             ->conditionallyAddItem('company_id')
             ->conditionallyAddItem('locale')
             ->conditionallyAddItem('remote')
+            ->conditionallyAddItem('ldap_sync')
             ->conditionallyAddItem('activated');
+
+        //dd($this);
             
         // If the manager_id is one of the users being updated, generate a warning.
         if (array_search($request->input('manager_id'), $user_raw_array)) {
@@ -107,7 +110,7 @@ class BulkUsersController extends Controller
         User::whereIn('id', $user_raw_array)
             ->where('id', '!=', Auth::id())->update($this->update_array);
 
-        if(array_key_exists('location_id', $this->update_array)){
+        if (array_key_exists('location_id', $this->update_array)){
             Asset::where('assigned_type', User::class)
                 ->whereIn('assigned_to', $user_raw_array)
                 ->update(['location_id' => $this->update_array['location_id']]);
diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 6ee22f68c7..03bddaef21 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -356,4 +356,5 @@ return [
     'checkout_user_tooltip' => 'Check this item out to a user',
     'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
     'maintenance_mode_title' => 'System Temporarily Unavilable',
+    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
 ];
\ No newline at end of file
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 9e7bdefba0..11082f20f0 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -13,6 +13,12 @@
 
 {{-- Page content --}}
 @section('content')
+
+    <style>
+        .radio {
+            margin-left: -20px;
+        }
+    </style>
     <div class="row">
         <div class="col-md-8 col-md-offset-2">
 
@@ -69,28 +75,43 @@
                                 {{ trans('admin/users/general.remote') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="checkbox">
+                                <div class="radio">
                                     <label for="remote">
-                                        {{ Form::radio('remote', '', true, ['aria-label'=>'remote']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote']) }}   {{ trans('admin/users/general.remote_label') }}<br>
-                                        {{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote']) }}   {{ trans('admin/users/general.not_remote_label') }}
+                                        {{ Form::radio('remote', '', true, ['aria-label'=>'remote', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
+                                        {{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.remote_label') }}<br>
+                                        {{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.not_remote_label') }}
 
                                     </label>
                                 </div>
                             </div>
                         </div> <!--/form-group-->
 
+                        <!-- ldap_sync -->
+                        <div class="form-group">
+                            <div class="col-sm-3 control-label">
+                                {{ trans('general.ldap_sync') }}
+                            </div>
+                            <div class="col-sm-9">
+                                <div class="radio">
+                                    <label for="ldap_import">
+                                        {{ Form::radio('ldap_import', '', true, ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
+                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{ trans('general.ldap_import') }}
+                                    </label>
+                                </div>
+                            </div>
+                        </div> <!--/form-group-->
+
                         <!-- activated -->
                         <div class="form-group">
                             <div class="col-sm-3 control-label">
                                 {{ trans('general.activated') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="checkbox">
+                                <div class="radio">
                                     <label for="activated">
-                                        {{ Form::radio('remote', '', true, ['aria-label'=>'activated']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('general.login_enabled')}} <br>
-                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated']) }}  {{  trans('admin/users/general.user_deactivated')}}
+                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
+                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('general.login_enabled')}} <br>
+                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('admin/users/general.user_deactivated')}}
 
                                     </label>
                                 </div>