[Rt-commit] r11999 - rt/branches/3.8-TESTING/html/installation

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu May  1 21:47:18 2008
New Revision: 11999

Modified:
   rt/branches/3.8-TESTING/html/installation/Sendmail.html

Log:
skip initialize step if possible

Modified: rt/branches/3.8-TESTING/html/installation/Sendmail.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Sendmail.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/Sendmail.html	Thu May  1 21:47:18 2008
@@ -58,7 +58,8 @@
     CurrentValue => RT::Installer->CurrentValues(@Types) &>
 
 <input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Initialize Database'), Back => 1,
+<& /Elements/Submit, Label => $RT::Installer->{DatabaseAction} eq 'none' ?
+loc('Next: Finish') : loc('Next: Initialize Database'), Back => 1,
     BackLabel => loc('Back: Customize Emails') &>
 </form>
 </&>
@@ -80,7 +81,6 @@
 
     unless ( @results ) {
 
-
         require File::Spec;
         my $file = File::Spec->catfile($RT::EtcPath, 'RT_SiteConfig.pm');
 
@@ -90,9 +90,16 @@
             }
             print $fh "1;\n";
             close $fh;
+            RT->Config->LoadConfigs; #( File => $file );
 
-            RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+            if ( $RT::Installer->{DatabaseAction} ne 'none' ) {
+                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
 'installation/Initialize.html');
+            }
+            else {
+                RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/Finish.html');
+            }
         }
         else {
             push @results, "Can't open config file $file to write: $!";