[Rt-commit] r13381 - in rt/3.8/trunk: share/html/Install

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Wed Jun 18 08:49:54 2008
New Revision: 13381

Modified:
   rt/3.8/trunk/lib/RT/Installer.pm
   rt/3.8/trunk/share/html/Install/Basics.html
   rt/3.8/trunk/share/html/Install/Sendmail.html

Log:
remove the Organization field. make it be the same as $rtname

Modified: rt/3.8/trunk/lib/RT/Installer.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Installer.pm	(original)
+++ rt/3.8/trunk/lib/RT/Installer.pm	Wed Jun 18 08:49:54 2008
@@ -135,12 +135,6 @@
             Description => 'RT Name',                        #loc
         },
     },
-    Organization => {
-        Widget          => '/Widgets/Form/String',
-        WidgetArguments => {
-            Description => 'Organization',                  #loc
-        },
-    },
     MinimumPasswordLength => {
         Widget          => '/Widgets/Form/Integer',
         WidgetArguments => {
@@ -154,12 +148,6 @@
             Type => 'password',
         },
     },
-    MaxAttachmentSize => {
-        Widget          => '/Widgets/Form/Integer',
-        WidgetArguments => {
-            Description => 'Max attachment size( in bytes )',             #loc
-        },
-    },
     OwnerEmail => {
         Widget          => '/Widgets/Form/String',
         WidgetArguments => {
@@ -281,6 +269,10 @@
         $content =~ s/^\s*1;\s*$//m;
     }
 
+    # make organization the same as rtname
+    $RT::Installer->{InstallConfig}{Organization} =
+        $RT::Installer->{InstallConfig}{rtname};
+
     if ( open my $fh, '>', $file  ) {
         for ( keys %{$RT::Installer->{InstallConfig}} ) {
             # we don't want to store root's password in config.

Modified: rt/3.8/trunk/share/html/Install/Basics.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Basics.html	(original)
+++ rt/3.8/trunk/share/html/Install/Basics.html	Wed Jun 18 08:49:54 2008
@@ -63,7 +63,7 @@
 <%init>
 my @results;
 
-my @Types = qw/rtname Organization WebDomain WebPort Timezone/;
+my @Types = qw/rtname WebDomain WebPort Timezone/;
 
 if ( $Run ) {
 

Modified: rt/3.8/trunk/share/html/Install/Sendmail.html
==============================================================================
--- rt/3.8/trunk/share/html/Install/Sendmail.html	(original)
+++ rt/3.8/trunk/share/html/Install/Sendmail.html	Wed Jun 18 08:49:54 2008
@@ -62,7 +62,7 @@
 <%init>
 my @results;
 
-my @Types = qw/MaxAttachmentSize SendmailArguments SendmailBounceArguments SendmailPath/;
+my @Types = qw/SendmailArguments SendmailBounceArguments SendmailPath/;
 
 if ( $Run ) {