[Rt-commit] r11875 - rt/branches/3.8-TESTING/html/installation
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu Apr 24 12:49:36 EDT 2008
Author: sunnavy
Date: Thu Apr 24 12:49:36 2008
New Revision: 11875
Modified:
rt/branches/3.8-TESTING/html/installation/Basics.html
rt/branches/3.8-TESTING/html/installation/DatabaseDetails.html
rt/branches/3.8-TESTING/html/installation/Emails.html
rt/branches/3.8-TESTING/html/installation/Initialize.html
rt/branches/3.8-TESTING/html/installation/Sendmail.html
Log:
added Back support
Modified: rt/branches/3.8-TESTING/html/installation/Basics.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Basics.html (original)
+++ rt/branches/3.8-TESTING/html/installation/Basics.html Thu Apr 24 12:49:36 2008
@@ -68,8 +68,10 @@
% }
</table>
+
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Customize Emails') &>
+<& /Elements/Submit, Label => loc('Next: Customize Emails'), Back => 1,
+ BackLabel => loc('Back: Customize Database Details') &>
</form>
</&>
<%init>
@@ -111,6 +113,10 @@
}
}
+ if ( $Back ) {
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/DatabaseDetails.html');
+ }
unless ( @results ) {
RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
'installation/Emails.html');
@@ -120,5 +126,6 @@
</%init>
<%args>
-$Run => 0
+$Run => undef
+$Back => undef
</%args>
Modified: rt/branches/3.8-TESTING/html/installation/DatabaseDetails.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/DatabaseDetails.html (original)
+++ rt/branches/3.8-TESTING/html/installation/DatabaseDetails.html Thu Apr 24 12:49:36 2008
@@ -83,11 +83,10 @@
</table>
<input type="hidden" name="Run" value="1">
-% if ( $RT::Installer->{InstallConfig}{DatabaseType} eq 'SQLite' ) {
-<& /Elements/Submit, Label => loc('Next: Customize Basics') &>
-% } else {
-<& /Elements/Submit, Label => loc('Next: Check Database Connectivity') &>
-% }
+<& /Elements/Submit, Label => $RT::Installer->{InstallConfig}{DatabaseType} eq
+'SQLite' ? loc('Next: Customize Basics') : loc('Next: Check Database
+ Connectivity'), Back => 1, BackLabel => loc('Back: Select Database Type'),
+ &>
</form>
</&>
<%init>
@@ -133,6 +132,11 @@
}
$RT::Installer->{TimeStamp} = time;
+ if ( $Back ) {
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/DatabaseType.html');
+ }
+
my $handle = DBIx::SearchBuilder::Handle->new();
my $db_type = $RT::Installer->{InstallConfig}{DatabaseType};
@@ -163,5 +167,6 @@
</%init>
<%args>
-$Run => 0
+$Run => undef
+$Back => undef
</%args>
Modified: rt/branches/3.8-TESTING/html/installation/Emails.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Emails.html (original)
+++ rt/branches/3.8-TESTING/html/installation/Emails.html Thu Apr 24 12:49:36 2008
@@ -64,7 +64,8 @@
</table>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Customize Sendmail') &>
+<& /Elements/Submit, Label => loc('Next: Customize Sendmail'), Back => 1,
+ BackLabel => loc('Back: Customize Basics') &>
</form>
</&>
<%init>
@@ -99,6 +100,11 @@
}
$RT::Installer->{TimeStamp} = time;
+ if ( $Back ) {
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/Basics.html');
+ }
+
for ( qw/MaxAttachmentSize/ ) {
if ( $ARGS{$_} && $ARGS{$_} !~ /^\d+$/ ) {
push @results, "Invalid $_: it should be a number";
@@ -114,5 +120,6 @@
</%init>
<%args>
-$Run => 0
+$Run => undef
+$Back => undef
</%args>
Modified: rt/branches/3.8-TESTING/html/installation/Initialize.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/Initialize.html (original)
+++ rt/branches/3.8-TESTING/html/installation/Initialize.html Thu Apr 24 12:49:36 2008
@@ -57,12 +57,18 @@
<form method="post">
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Initialize Database') &>
+<& /Elements/Submit, Label => loc('Initialize Database'), Back => 1,
+ BackLabel => loc('Back: Customize Sendmail') &>
</form>
</&>
<%init>
my @results;
if ( $Run ) {
+ if ( $Back ) {
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/Sendmail.html');
+ }
+
my $msg = `echo | $^X sbin/rt-setup-database --action init --dba $RT::Installer->{InstallConfig}{DatabaseUser} --dba-password '$RT::Installer->{InstallConfig}{DatabasePassword}' 2>&1`;
@results = split /\n/, $msg;
# XXX $? doesn't work here, so I decided to grep the strings to find if any
@@ -75,5 +81,6 @@
</%init>
<%args>
$Run => undef
+$Back => undef
</%args>
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 Apr 24 12:49:36 2008
@@ -66,7 +66,8 @@
</table>
<input type="hidden" name="Run" value="1">
-<& /Elements/Submit, Label => loc('Next: Initialize Database') &>
+<& /Elements/Submit, Label => loc('Next: Initialize Database'), Back => 1,
+ BackLabel => loc('Back: Customize Emails') &>
</form>
</&>
<%init>
@@ -100,6 +101,11 @@
}
$RT::Installer->{TimeStamp} = time;
+ if ( $Back ) {
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .
+'installation/Emails.html');
+ }
+
unless ( @results ) {
@@ -125,5 +131,6 @@
</%init>
<%args>
-$Run => 0
+$Run => undef
+$Back => undef
</%args>
More information about the Rt-commit
mailing list