Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Controller / Admin.pm

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index e26d165540051c44e833d84dc6ac87b03877280e..6c62024d57d7da7793ebeab86e1570b6814523bf 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -250,7 +250,7 @@ sub action_test_database_connectivity {
 
   $dbh->disconnect if $dbh;
 
-  $self->render('admin/test_db_connection',
+  $self->render('admin/test_db_connection', { layout => 0 },
                 title => t8('Database Connection Test'),
                 ok    => $ok,
                 error => $error);
@@ -375,8 +375,6 @@ sub action_database_administration {
   $::form->{dbpasswd}  ||= $::auth->{DB_config}->{password};
   $::form->{dbdefault} ||= 'template1';
 
-  $::request->layout->focus('#dbhost');
-
   $self->render('admin/dbadmin', title => t8('Database Administration'));
 }
 
@@ -547,8 +545,8 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
-  $::request->layout->focus('#admin_password');
-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);
+  my $version         = $::form->read_version;
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
 }
 
 sub edit_user_form {