Nach Auth-DB-Upgrade nicht neu einloggen müssen

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

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index c1b2ec1e8ae5b41960cf51e43e7f6bd76aa056da..5555baa20624d0d630eb0ec66725c2d88e10fec3 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -58,7 +58,7 @@ sub action_apply_dbupgrade_scripts {
   my ($self) = @_;
 
   return if $self->apply_dbupgrade_scripts;
   my ($self) = @_;
 
   return if $self->apply_dbupgrade_scripts;

-  $self->action_show;
+  $self->redirect_to(action => 'show');

 }
 
 sub action_create_auth_db {
 }
 
 sub action_create_auth_db {


@@ -157,12 +157,21 @@ sub action_save_user {
 sub action_delete_user {
   my ($self) = @_;
 
 sub action_delete_user {
   my ($self) = @_;
 

+  my @clients = @{ $self->user->clients || [] };
+

   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));
     return;
   }
 
   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));
     return;
   }
 

+  # Flag corresponding entries in 'employee' as deleted.
+  foreach my $client (@clients) {
+    my $dbh = $client->dbconnect(AutoCommit => 1) || next;
+    $dbh->do(qq|UPDATE employee SET deleted = TRUE WHERE login = ?|, undef, $self->user->login);
+    $dbh->disconnect;
+  }
+

   flash_later('info', t8('The user has been deleted.'));
   $self->redirect_to(action => 'show');
 }
   flash_later('info', t8('The user has been deleted.'));
   $self->redirect_to(action => 'show');
 }


@@ -455,7 +464,7 @@ sub use_multiselect_js {
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout->focus('#admin_password');
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout->focus('#admin_password');

-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->{version}), %params);
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params);

 }
 
 sub edit_user_form {
 }
 
 sub edit_user_form {