FEATURE: add soft deletes to users
This commit is contained in:
@@ -25,8 +25,7 @@ class EditUser extends Controller
|
||||
// @todo add some authorization (e.g. via can/cannot methods)
|
||||
|
||||
// try to find given user
|
||||
$user = User::where('status', '!=', User::STATE_DELETED)
|
||||
->findOrFail($id);
|
||||
$user = User::findOrFail($id);
|
||||
|
||||
$states = UserStates::getWithTranslations();
|
||||
$roles = UserRoles::getWithTranslations();
|
||||
|
||||
@@ -12,13 +12,11 @@ class UsersOverview extends Controller
|
||||
{
|
||||
public function getOverview($status = null, $perPage = 12)
|
||||
{
|
||||
$users = User::where('status', '<>', User::STATE_DELETED)
|
||||
->orderBy('id', 'desc');
|
||||
$users = User::orderBy('id', 'desc');
|
||||
|
||||
// get statuses
|
||||
$statuses = UserStates::getWithTranslations();
|
||||
$statuses[''] = trans('admin/userManagement.allStatuses');
|
||||
unset($statuses[User::STATE_DELETED]);
|
||||
|
||||
// filter using status
|
||||
if (!is_null($status) && isset($statuses[$status])) {
|
||||
|
||||
Reference in New Issue
Block a user