[Rt-commit] r13076 - rt/branches/3.8-TESTING/share/html/Install

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Mon Jun  9 16:34:42 2008
New Revision: 13076

Modified:
   rt/branches/3.8-TESTING/share/html/Install/DatabaseDetails.html

Log:
admin of mysql is root, of Pg is postgres

Modified: rt/branches/3.8-TESTING/share/html/Install/DatabaseDetails.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Install/DatabaseDetails.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Install/DatabaseDetails.html	Mon Jun  9 16:34:42 2008
@@ -51,7 +51,14 @@
 
 <form method="post">
 <& /Widgets/BulkEdit, Types => \@Types, Meta => $RT::Installer->{Meta},
-    CurrentValue => RT::Installer->CurrentValues(@Types) &>
+    CurrentValue => { %{RT::Installer->CurrentValues(@Types)},
+        DatabaseAdmin =>
+            RT::Installer->CurrentValue( 'DatabaseAdmin' ) ||
+            $RT::Installer->{InstallConfig}{DatabaseAdmin} ||
+            ( $db_type eq 'mysql' ? 'root'
+              : $db_type eq 'Pg' ? 'postgres'
+              : '' ) }
+                    &>
 <input type="hidden" name="Run" value="1">
 
 <& /Elements/Submit, Label => loc('Check Database Connectivity'), 
@@ -70,11 +77,13 @@
 
 my @Types = 'DatabaseName';
 
-unless ( $RT::Installer->{InstallConfig}{DatabaseType} eq 'SQLite' ) {
+my $db_type = $RT::Installer->{InstallConfig}{DatabaseType};
+
+unless ( $db_type eq 'SQLite' ) {
     push @Types, 'DatabaseHost', 'DatabasePort', 'DatabaseAdmin',
         'DatabaseAdminPassword', 'DatabaseUser', 'DatabasePassword';
 }
-if ( $RT::Installer->{InstallConfig}{DatabaseType} eq 'Pg' ) {
+if ( $db_type eq 'Pg' ) {
     push @Types, 'DatabaseRequireSSL';
 }