[Rt-commit] r12150 - in rt/branches/3.8-TESTING: etc html/Search html/installation

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Thu May  8 06:52:11 2008
New Revision: 12150

Modified:
   rt/branches/3.8-TESTING/etc/initialdata
   rt/branches/3.8-TESTING/html/Search/Results.rdf
   rt/branches/3.8-TESTING/html/Search/Simple.html
   rt/branches/3.8-TESTING/html/Ticket/Forward.html
   rt/branches/3.8-TESTING/html/Ticket/GnuPG.html
   rt/branches/3.8-TESTING/html/installation/index.html

Log:
$WebURL has trailing '/'

Modified: rt/branches/3.8-TESTING/etc/initialdata
==============================================================================
--- rt/branches/3.8-TESTING/etc/initialdata	(original)
+++ rt/branches/3.8-TESTING/etc/initialdata	Thu May  8 06:52:11 2008
@@ -230,7 +230,7 @@
        Owner: {$Ticket->OwnerObj->Name}
   Requestors: {$Ticket->RequestorAddresses}
       Status: {$Ticket->Status}
- Ticket <URL: {RT->Config->Get(\'WebURL\')}/Ticket/Display.html?id={$Ticket->id} >
+ Ticket <URL: {RT->Config->Get(\'WebURL\')}Ticket/Display.html?id={$Ticket->id} >
 
 
 {$Transaction->Content()}

Modified: rt/branches/3.8-TESTING/html/Search/Results.rdf
==============================================================================
--- rt/branches/3.8-TESTING/html/Search/Results.rdf	(original)
+++ rt/branches/3.8-TESTING/html/Search/Results.rdf	Thu May  8 06:52:11 2008
@@ -75,7 +75,7 @@
         $creator_str =~ s/[\r\n]//g;
         $rss->add_item(
           title       =>  $Ticket->Subject,
-          link        => RT->Config->Get('WebURL')."/Ticket/Display.html?id=".$Ticket->id,
+          link        => RT->Config->Get('WebURL')."Ticket/Display.html?id=".$Ticket->id,
           description => $Ticket->Transactions->First->Content,
           dc => {
             subject  => ($Ticket->Subject  || loc('No subject')),

Modified: rt/branches/3.8-TESTING/html/Search/Simple.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Search/Simple.html	(original)
+++ rt/branches/3.8-TESTING/html/Search/Simple.html	Thu May  8 06:52:11 2008
@@ -80,13 +80,13 @@
 if ($q) {
     my $tickets = new RT::Tickets( $session{'CurrentUser'} );
     if ($q =~ /^(\d+)$/) {
-        RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/Ticket/Display.html?id=".$q);
+        RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Ticket/Display.html?id=".$q);
     }
 
     $m->callback( %ARGS, query => \$q, CallbackName => 'ModifyQuery' );
 
     if ($q =~ /^(\d+)$/) {
-        RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/Ticket/Display.html?id=".$q);
+        RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."Ticket/Display.html?id=".$q);
     }
 
     my %args = (

Modified: rt/branches/3.8-TESTING/html/Ticket/Forward.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/Forward.html	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/Forward.html	Thu May  8 06:52:11 2008
@@ -100,7 +100,7 @@
         $session{'i'}++;
         push @{ $session{"Actions"} ||= [] }, @results;
         RT::Interface::Web::Redirect(
-            RT->Config->Get('WebURL') ."/Ticket/Display.html?id=". $id
+            RT->Config->Get('WebURL') ."Ticket/Display.html?id=". $id
         );
     }
 }

Modified: rt/branches/3.8-TESTING/html/Ticket/GnuPG.html
==============================================================================
--- rt/branches/3.8-TESTING/html/Ticket/GnuPG.html	(original)
+++ rt/branches/3.8-TESTING/html/Ticket/GnuPG.html	Thu May  8 06:52:11 2008
@@ -55,7 +55,7 @@
 % $m->callback( CallbackName => 'BeforeActionList', %ARGS, Actions => \@results, ARGSRef => \%ARGS );
 <& /Elements/ListActions, actions => \@results &>
 <form method="post" action="<% RT->Config->Get('WebPath') . $m->request_comp->path %>?id=<% $id %>">
-<a href="<% RT->Config->Get('WebURL') %>/Ticket/Display.html?id=<% $txn->Ticket %>#txn-<% $id %>">
+<a href="<% RT->Config->Get('WebURL') %>Ticket/Display.html?id=<% $txn->Ticket %>#txn-<% $id %>">
 <% loc('Return back to the ticket') %>
 </a>
 <& /Elements/Submit,

Modified: rt/branches/3.8-TESTING/html/installation/index.html
==============================================================================
--- rt/branches/3.8-TESTING/html/installation/index.html	(original)
+++ rt/branches/3.8-TESTING/html/installation/index.html	Thu May  8 06:52:11 2008
@@ -90,8 +90,7 @@
                 SendmailArguments SendmailBounceArguments SendmailPath/ ) {
             $RT::Installer->{InstallConfig}{$field} ||= RT->Config->Get($field);
         }
-        $RT::Installer->{TimeStamp} = time;
-        RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .  '/installation/DatabaseType.html');
+        RT::Interface::Web::Redirect(RT->Config->Get('WebURL') .  'installation/DatabaseType.html');
     
         }
 </%init>