Skip to content

Commit f27d8c8

Browse files
Issue #568 fixed
1 parent dd0e4e8 commit f27d8c8

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

packages/Webkul/Admin/src/Http/Controllers/Setting/UserController.php

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,30 @@ public function destroy($id)
224224
*/
225225
public function massUpdate()
226226
{
227+
$count = 0;
228+
227229
$data = request()->all();
228230

229-
foreach ($data['rows'] as $userId) {
230-
if (($userId != auth()->guard('user')->user()->id) || ($data['value'] == 1)) {
231-
$this->userRepository->update([
232-
'status' => $data['value'],
233-
], $userId);
231+
foreach (request('rows') as $userId) {
232+
if (auth()->guard('user')->user()->id == $userId) {
233+
continue;
234234
}
235+
236+
Event::dispatch('settings.user.update.before', $userId);
237+
238+
$this->userRepository->update([
239+
'status' => request('value'),
240+
], $userId);
241+
242+
Event::dispatch('settings.user.update.after', $userId);
243+
244+
$count++;
245+
}
246+
247+
if (! $count) {
248+
return response()->json([
249+
'message' => trans('admin::app.settings.users.mass-update-failed'),
250+
], 400);
235251
}
236252

237253
return response()->json([

packages/Webkul/Admin/src/Resources/lang/en/app.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@
459459
'last-delete-error' => 'At least one user is required.',
460460
'user-define-error' => 'Can not delete system user.',
461461
'mass-update-success' => 'Users updated successfully.',
462+
'mass-update-failed' => 'Users can not be updated.',
462463
'mass-delete-success' => 'Users deleted successfully.',
463464
'mass-delete-failed' => 'Users can not be deleted.',
464465
],

0 commit comments

Comments
 (0)