FEATURE #1359: add status changing (user management)

This commit is contained in:
Michal Kváček
2016-01-24 23:38:34 +01:00
parent f872475752
commit 6af60248e6
5 changed files with 103 additions and 22 deletions
+16 -3
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin;
use App\Enumerations\UserRoles;
use App\Enumerations\UserStates;
use App\Http\Controllers\Controller;
use App\Http\Requests;
use App\Http\Requests\EditUserRequest;
@@ -19,12 +20,20 @@ class EditUser extends Controller
$id = Auth::user()->id;
}
// try to find given user
$user = User::findOrFail($id);
// @todo add some authorization (e.g. via can/cannot methods)
// try to find given user
$user = User::where('status', '!=', User::STATE_DELETED)
->findOrFail($id);
$states = UserStates::getWithTranslations();
$roles = UserRoles::getWithTranslations();
return view('admin.userManagement.edit', ['user' => $user, 'roles' => $roles]);
return view('admin.userManagement.edit', [
'user' => $user,
'states' => $states,
'roles' => $roles
]);
}
/**
@@ -52,6 +61,10 @@ class EditUser extends Controller
$user->role = $request->role;
}
if (isset($request->status)) {
$user->status = $request->status;
}
if (isset($request->password)) {
$user->password = Hash::make($request->password);
}
+7 -1
View File
@@ -3,6 +3,7 @@
namespace App\Http\Controllers\Admin;
use App\Enumerations\UserRoles;
use App\Enumerations\UserStates;
use App\Http\Controllers\Controller;
use App\Http\Requests;
use App\Models\User;
@@ -21,7 +22,12 @@ class UserDetail extends Controller
$user = User::findOrFail($id);
$roles = UserRoles::getWithTranslations();
$states = UserStates::getWithTranslations();
return view('admin.userManagement.detail', ['user' => $user, 'roles' => $roles]);
return view('admin.userManagement.detail', [
'user' => $user,
'states' => $states,
'roles' => $roles
]);
}
}