minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: fix minor bug in user management

Browse Source
This commit is contained in:
Michal Kváček
2017-08-02 13:52:19 +02:00
parent a4c020daa0
commit 3d73bffa6e
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Enumerations/UserRoles.php
+1 -1
View File
@@ -9,7 +9,7 @@ class UserRoles extends BaseEnumeration
{ {
$roles = [ $roles = [
User::ROLE_ADMIN => 'admin/userManagement.role_' . User::ROLE_ADMIN, User::ROLE_ADMIN => 'admin/userManagement.role_' . User::ROLE_ADMIN,
User::ROLE_EDITOR => 'admin/userManagement.role_' . User::ROLE_EDITOR, // User::ROLE_EDITOR => 'admin/userManagement.role_' . User::ROLE_EDITOR,
User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR User::ROLE_VISITOR => 'admin/userManagement.role_' . User::ROLE_VISITOR
]; ];
app/Http/Controllers/Admin/Users/EditUser.php
+1 -1
View File
@@ -39,7 +39,7 @@ class EditUser extends Controller
public function getEditUser(User $user = null) public function getEditUser(User $user = null)
{ {
// when no user specified, lets assume we want to edit "me" // when no user specified, lets assume we want to edit "me"
if (!$user->exists()) { if (!$user->exists) {
$user = Auth::user(); $user = Auth::user();
} }
app/Http/Controllers/Admin/Users/UserDetail.php
+3 -2
View File
@@ -25,10 +25,11 @@ class UserDetail extends Controller
public function getDetail(User $user = null) public function getDetail(User $user = null)
{ {
// when no user specified, lets assume we want to edit "me" // when no user specified, lets assume we want to edit "me"
if (!$user->exists()) { if (!$user->exists) {
$id = Auth::user(); $user = Auth::user();
} }
$actions = $this->log->getUserActions($user->id, 10); $actions = $this->log->getUserActions($user->id, 10);
$roles = UserRoles::getWithTranslations(); $roles = UserRoles::getWithTranslations();
$states = UserStates::getWithTranslations(); $states = UserStates::getWithTranslations();
app/Http/Controllers/Auth/LoginController.php
+1
View File
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
class LoginController extends Controller class LoginController extends Controller
{ {
app/Http/Middleware/Authenticate.php
+2 -3
View File
@@ -20,7 +20,7 @@ class Authenticate
public function handle($request, Closure $next, $guard = null) public function handle($request, Closure $next, $guard = null)
{ {
if (!Auth::guard($guard) if (!Auth::guard($guard)
->check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR) { ->check() || Auth::user()->status != User::STATE_ACTIVE || Auth::user()->role == User::ROLE_VISITOR || 0) {
Auth::logout(); Auth::logout();
if ($request->ajax()) { if ($request->ajax()) {
@@ -38,8 +38,7 @@ class Authenticate
return redirect() return redirect()
->route('login') ->route('login')
->with('warning', trans($message)) ->with('warning', trans($message));
->with('redirectTo', $request->fullUrl());
} }
return $next($request); return $next($request);