merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed issue #304

This commit is contained in:
Prashant Singh 2019-02-18 17:19:54 +05:30
parent f3cd11737c
commit 262bfbbd06
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/DataGrids/UserDataGrid.php
View File

@ -84,5 +84,11 @@ class UserDataGrid extends DataGrid
'route' => 'admin.users.edit',
'icon' => 'icon pencil-lg-icon'
]);
$this->addAction([
'type' => 'Delete',
'route' => 'admin.users.delete',
'icon' => 'icon trash-icon'
]);
}
}

23
packages/Webkul/User/src/Http/Controllers/UserController.php
View File

@ -159,10 +159,7 @@ class UserController extends Controller
*/
public function destroy($id)
{
if ($this->admin->count() == 1) {
session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin']));
} else {
Event::fire('user.admin.delete.before', $id);
Event::fire('user.admin.delete.before', $id);
if (auth()->guard('admin')->user()->id == $id) {
return view('admin::customers.confirm-password');
@ -173,7 +170,21 @@ class UserController extends Controller
Event::fire('user.admin.delete.after', $id);
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source']));
}
// if ($this->admin->count() == 1) {
// session()->flash('error', trans('admin::app.response.last-delete-error', ['name' => 'Admin']));
// } else {
// Event::fire('user.admin.delete.before', $id);
// if (auth()->guard('admin')->user()->id == $id) {
// return view('admin::customers.confirm-password');
// }
// $this->admin->delete($id);
// Event::fire('user.admin.delete.after', $id);
// session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Admin source']));
// }
return redirect()->back();
}
@ -208,5 +219,7 @@ class UserController extends Controller
return redirect()->route($this->_config['redirect']);
}
return redirect()->route($this->_config['redirect']);
}
}