projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sprache auf ungültig setzen im Admin-Bereich
[kivitendo-erp.git]
/
SL
/
Controller
/
LoginScreen.pm
diff --git
a/SL/Controller/LoginScreen.pm
b/SL/Controller/LoginScreen.pm
index
80700b9
..
adcc8f0
100644
(file)
--- a/
SL/Controller/LoginScreen.pm
+++ b/
SL/Controller/LoginScreen.pm
@@
-13,6
+13,7
@@
use SL::DB::AuthUser;
use SL::DB::Employee;
use SL::Locale::String qw(t8);
use SL::User;
use SL::DB::Employee;
use SL::Locale::String qw(t8);
use SL::User;
+use SL::Version;
use Rose::Object::MakeMethods::Generic (
'scalar --get_set_init' => [ qw(clients default_client_id) ],
use Rose::Object::MakeMethods::Generic (
'scalar --get_set_init' => [ qw(clients default_client_id) ],
@@
-57,7
+58,9
@@
sub action_login {
%::myconfig = $login ? $::auth->read_user(login => $login) : ();
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
%::myconfig = $login ? $::auth->read_user(login => $login) : ();
$::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode};
- SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode});
+ my $auth_result = SL::Dispatcher::AuthHandler::User->new->handle(callback => $::form->{callback});
+
+ $::dispatcher->end_request unless $auth_result;
$::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
$::request->layout(SL::Layout::Dispatcher->new(style => $::myconfig{menustyle}));
@@
-67,7
+70,8
@@
sub action_login {
# Auth DB needs update? If so log the user out forcefully.
if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
$::auth->destroy_session;
# Auth DB needs update? If so log the user out forcefully.
if (User::LOGIN_AUTH_DBUPDATE_AVAILABLE() == $result) {
$::auth->destroy_session;
- return $self->render('login_screen/auth_db_needs_update');
+ # must be without layout because menu rights might not exist yet
+ return $self->render('login_screen/auth_db_needs_update', { layout => 0 });
}
# Basic client tables available? If not tell the user to create them
}
# Basic client tables available? If not tell the user to create them
@@
-78,7
+82,7
@@
sub action_login {
}
# Database update available?
}
# Database update available?
-
::end_of_request()
if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
+
$::dispatcher->end_request
if User::LOGIN_DBUPDATE_AVAILABLE() == $result;
# Other login errors.
if (User::LOGIN_OK() != $result) {
# Other login errors.
if (User::LOGIN_OK() != $result) {
@@
-161,7
+165,9
@@
sub error_state {
}
sub set_layout {
}
sub set_layout {
- $::request->{layout} = SL::Layout::Dispatcher->new(style => 'login');
+ $::request->{layout} = $::request->is_mobile
+ ? SL::Layout::Dispatcher->new(style => 'mobile_login')
+ : SL::Layout::Dispatcher->new(style => 'login');
}
sub init_clients {
}
sub init_clients {
@@
-177,7
+183,7
@@
sub init_default_client_id {
sub show_login_form {
my ($self, %params) = @_;
sub show_login_form {
my ($self, %params) = @_;
- $self->render('login_screen/user_login', %params, version =>
$::form->read_version
);
+ $self->render('login_screen/user_login', %params, version =>
SL::Version->get_version, callback => $::form->{callback}
);
}
1;
}
1;