diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 23bddfb3b4..e133325215 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -169,6 +169,7 @@ class BulkUsersController extends Controller ->conditionallyAddItem('remote') ->conditionallyAddItem('ldap_import') ->conditionallyAddItem('activated') + ->conditionallyAddItem('display_name') ->conditionallyAddItem('start_date') ->conditionallyAddItem('end_date') ->conditionallyAddItem('city') @@ -214,6 +215,10 @@ class BulkUsersController extends Controller $this->update_array['locale'] = null; } + if ($request->input('null_display_name')=='1') { + $this->update_array['display_name'] = null; + } + if (! $manager_conflict) { $this->conditionallyAddItem('manager_id'); } diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index 0533bd5cb3..f41760b271 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -214,7 +214,7 @@
@if ((config('app.lock_passwords') || (!Auth::user()->isSuperUser()))) - {{ trans('admin/users/general.group_memberships_helpblock') }}

+

{{ trans('admin/users/general.group_memberships_helpblock') }}

@else
+ {!! $errors->first('display_name', ' :message') !!} +
+
+ +
+
+