From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 17 Jun 2013 08:21:09 +0000 (+0200)
Subject: Nach Auth-DB-Upgrade nicht neu einloggen müssen
X-Git-Tag: release-3.1.0beta1~326
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=516cd9bbdb6b8e40da93925965b92710f1a97bfc;p=kivitendo-erp.git

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

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index 7277e7940..5555baa20 100644
--- 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;
-  $self->action_show;
+  $self->redirect_to(action => 'show');
 }
 
 sub action_create_auth_db {
diff --git a/templates/webpages/dbupgrade/footer.html b/templates/webpages/dbupgrade/footer.html
index 187eed4fb..8a5c41ac6 100644
--- a/templates/webpages/dbupgrade/footer.html
+++ b/templates/webpages/dbupgrade/footer.html
@@ -3,7 +3,7 @@
 
 <form action="[% IF is_admin %]controller.pl[% ELSE %]login.pl[% END %]">
 
- <input type="hidden" name="action" value="[% IF is_admin %]Admin/login[% ELSE %]company_logo[% END %]">
+ <input type="hidden" name="action" value="[% IF is_admin %]Admin/apply_dbupgrade_scripts[% ELSE %]company_logo[% END %]">
 
  <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>