DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop

Browse source
This commit is contained in:
snipe 2020-09-04 16:02:38 -07:00
parent 97743160ef 10648de9af
commit aabf9b6f9c
No known key found for this signature in database
GPG key ID: 10BFFDA3ED34B5AC
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Http/Controllers/Users/BulkUsersController.php
View file

@ -42,7 +42,8 @@ class BulkUsersController extends Controller
->with('groups', Group::pluck('name', 'id')); ->with('groups', Group::pluck('name', 'id'));
} elseif ($request->input('bulk_actions') == 'delete') { } elseif ($request->input('bulk_actions') == 'delete') {
return view('users/confirm-bulk-delete', compact('users', Helper::statusLabelList())); return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list', Helper::statusLabelList());
} elseif ($request->input('bulk_actions') == 'bulkpasswordreset') { } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
foreach ($users as $user) { foreach ($users as $user) {