diff --git a/Http/Controllers/Auth/AuthenticatedSessionController.php b/Http/Controllers/Auth/AuthenticatedSessionController.php index a988208..9b4c873 100644 --- a/Http/Controllers/Auth/AuthenticatedSessionController.php +++ b/Http/Controllers/Auth/AuthenticatedSessionController.php @@ -10,18 +10,6 @@ class AuthenticatedSessionController extends Controller { - /** - * Display the login view. - * - * @return \Illuminate\View\View - */ - public function create() - { - addJavascriptFile('assets/js/custom/authentication/sign-in/general.js'); - - return view('usermanager::auth.login'); - } - /** * Handle an incoming authentication request. * @@ -89,6 +77,24 @@ return redirect()->intended(RouteServiceProvider::HOME); } + /** + * Display the login view. + * + * @return \Illuminate\View\View + */ + public function create() + { + if (isset($_ENV['METHOD_AUTH'])) { + if ($_ENV['METHOD_AUTH'] == 'usermanager') { + addJavascriptFile('assets/js/custom/authentication/sign-in/uim.js'); + return view('usermanager::auth.login-usermanager'); + } else { + addJavascriptFile('assets/js/custom/authentication/sign-in/general.js'); + return view('usermanager::auth.login'); + } + } + } + /** * Destroy an authenticated session. * diff --git a/Resources/views/partials/menu/_root.blade.php b/Resources/views/partials/menu/_root.blade.php index 0646c26..4a838a9 100644 --- a/Resources/views/partials/menu/_root.blade.php +++ b/Resources/views/partials/menu/_root.blade.php @@ -23,6 +23,7 @@ + @canany(['role.read','role.create','role.update','role.delete']) + @endcanany + @canany(['permission.read','permission.create','permission.update','permission.delete']) + @endcanany diff --git a/Resources/views/users/users/_table.blade.php b/Resources/views/users/users/_table.blade.php index 843dfd4..214cd1b 100644 --- a/Resources/views/users/users/_table.blade.php +++ b/Resources/views/users/users/_table.blade.php @@ -79,7 +79,7 @@ $("#role_" + _role).prop('checked', true); } - $('.form_{{$route[0].'_'.$route[1]}}').attr('action', '{{ URL::to('/'.$route[0].'/'.$route[1].'/') }}/' + response.data.id).append(''); + $('.form_{{$route[0].'_'.$route[1]}}').attr('action', '{{ URL::to('/'.$route[1].'/') }}/' + response.data.id).append(''); $('#kt_modal_{{$route[0].'_'.$route[1]}}').modal('show'); } })