X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/ce651068ffd6d20ef408dbc45d8a04a69a3dc3ed..b1b3cdebde020c32eb5d0e39e9e6139e1508b9f7:/SL/Controller/LoginScreen.pm diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm index adf8b471c..da2c0bfff 100644 --- a/SL/Controller/LoginScreen.pm +++ b/SL/Controller/LoginScreen.pm @@ -56,7 +56,6 @@ sub action_login { } %::myconfig = $login ? $::auth->read_user(login => $login) : (); - $::form->{login} = $login; $::locale = Locale->new($::myconfig{countrycode}) if $::myconfig{countrycode}; SL::Dispatcher::AuthHandler::User->new->handle(countrycode => $::myconfig{countrycode}); @@ -68,7 +67,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; - 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 @@ -155,6 +155,7 @@ sub error_state { my %states = ( session => { warning => t8('The session has expired. Please log in again.') }, password => { error => t8('Incorrect username or password or no access to selected client!') }, + action => { warning => t8('The action is missing or invalid.') }, ); return %{ $states{$_[0]} || {} };