[Rt-commit] r13087 - in rt/branches/3.8-TESTING: . share/html/Admin/Elements share/html/Elements share/html/Install

[jesse at bestpractical.com]

Author: jesse
Date: Mon Jun  9 17:24:54 2008
New Revision: 13087

Modified:
   rt/branches/3.8-TESTING/   (props changed)
   rt/branches/3.8-TESTING/lib/RT/Installer.pm
   rt/branches/3.8-TESTING/lib/RT/Test.pm
   rt/branches/3.8-TESTING/share/html/Admin/Elements/SelectStage
   rt/branches/3.8-TESTING/share/html/Elements/HeaderJavascript
   rt/branches/3.8-TESTING/share/html/Install/DatabaseDetails.html
   rt/branches/3.8-TESTING/share/html/Install/Sendmail.html

Log:


Modified: rt/branches/3.8-TESTING/lib/RT/Installer.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Installer.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Installer.pm	Mon Jun  9 17:24:54 2008
@@ -150,7 +150,7 @@
     MaxAttachmentSize => {
         Widget          => '/Widgets/Form/Integer',
         WidgetArguments => {
-            Description => 'Max attachment size',             #loc
+            Description => 'Max attachment size( in bytes )',             #loc
         },
     },
     OwnerEmail => {
@@ -186,7 +186,7 @@
     SendmailPath => {
         Widget          => '/Widgets/Form/String',
         WidgetArguments => {
-            Description => 'Sendmail path',                  #loc
+            Description => 'where is sendmail command',                  #loc
         },
     },
     WebDomain => {

Modified: rt/branches/3.8-TESTING/lib/RT/Test.pm
==============================================================================
--- rt/branches/3.8-TESTING/lib/RT/Test.pm	(original)
+++ rt/branches/3.8-TESTING/lib/RT/Test.pm	Mon Jun  9 17:24:54 2008
@@ -114,6 +114,7 @@
 Set( \$DatabaseName , $dbname);
 Set( \$LogToSyslog , undef);
 Set( \$LogToScreen , "warning");
+Set( \$MailCommand, 'testfile');
 };
     print $config $args{'config'} if $args{'config'};
     print $config "\n1;\n";

Modified: rt/branches/3.8-TESTING/share/html/Admin/Elements/SelectStage
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Admin/Elements/SelectStage	(original)
+++ rt/branches/3.8-TESTING/share/html/Admin/Elements/SelectStage	Mon Jun  9 17:24:54 2008
@@ -47,17 +47,26 @@
 %# END BPS TAGGED BLOCK }}}
 <select name="<%$Name%>">
 % foreach my $stage (@stages) {
-<option value="<%$stage%>"
-<% ($stage eq $Default) && qq[ selected="selected"] |n %>
-><% loc($stage) %>
+
+%# allow [stage, display] in place of a scalar stage name
+% my ($value, $display) = ref($stage) ? @$stage : ($stage, $stage);
+
+<option value="<%$value%>"
+<% ($value eq $Default) && qq[ selected="selected"] |n %>
+><% loc($display) %>
 </option>
+
 % }
 <%INIT>
 if ( !defined $Default || $Default eq '') {
     $Default = 'TransactionCreate';
 }
 my @stages = 'TransactionCreate';
-push @stages, 'TransactionBatch' if RT->Config->Get('UseTransactionBatch');
+
+push @stages, RT->Config->Get('UseTransactionBatch')
+            ? 'TransactionBatch'
+            : ['TransactionBatch', 'TransactionBatch (DISABLED)'];
+
 push @stages, 'Disabled';
 </%INIT>
 <%ARGS>

Modified: rt/branches/3.8-TESTING/share/html/Elements/HeaderJavascript
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Elements/HeaderJavascript	(original)
+++ rt/branches/3.8-TESTING/share/html/Elements/HeaderJavascript	Mon Jun  9 17:24:54 2008
@@ -77,8 +77,8 @@
               || (textArea.getAttribute('className') == 'messagebox')) {
                 // Turn the original plain text content into HTML 
 
-%# Special case - When continuing an edit session with attachment, keep the HTMLified content.
-% if (!$m->request_args->{'AddMoreAttach'} && !$m->request_args->{'UpdatePreview'}) {
+%# Special case - when we re-edit a textarea, don't re-encode it
+% if (!$m->request_args->{'FCKeditorEncoded'}) {
                 textArea.value = textArea.value.replace(
                     /&/g, "&amp;"
                 ).replace(
@@ -90,6 +90,14 @@
                 );
 % }
 
+%# for this template..
+                var FCKeditorEncoded = document.createElement('input');
+                FCKeditorEncoded.setAttribute('type', 'hidden');
+                FCKeditorEncoded.setAttribute('name', 'FCKeditorEncoded');
+                FCKeditorEncoded.setAttribute('value', '1');
+                textArea.parentNode.appendChild(FCKeditorEncoded);
+
+%# for FCKeditor..
                 var typeField = document.createElement('input');
                 typeField.setAttribute('type', 'hidden');
                 typeField.setAttribute('name', textArea.name + 'Type');

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 17:24:54 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';
 }
 

Modified: rt/branches/3.8-TESTING/share/html/Install/Sendmail.html
==============================================================================
--- rt/branches/3.8-TESTING/share/html/Install/Sendmail.html	(original)
+++ rt/branches/3.8-TESTING/share/html/Install/Sendmail.html	Mon Jun  9 17:24:54 2008
@@ -81,6 +81,10 @@
         }
     }
 
+    unless ( -e $ARGS{SendmailPath} ) {
+        push @results, "$ARGS{SendmailPath} doesn't exist.";
+    }
+
     unless ( @results ) {
 
         my ( $status, $msg ) = RT::Installer->SaveConfig;