[Rt-commit] r19704 - rt/3.999/trunk/share/html/Elements

[sartak at bestpractical.com]

Author: sartak
Date: Mon May 18 05:28:06 2009
New Revision: 19704

Modified:
   rt/3.999/trunk/share/html/Elements/ColumnMap
   rt/3.999/trunk/share/html/Elements/ShowSearch

Log:
Fixes for WebBaseURL

Modified: rt/3.999/trunk/share/html/Elements/ColumnMap
==============================================================================
--- rt/3.999/trunk/share/html/Elements/ColumnMap	(original)
+++ rt/3.999/trunk/share/html/Elements/ColumnMap	Mon May 18 05:28:06 2009
@@ -132,11 +132,12 @@
             return \qq{<input type="radio" name="selected_ticket" value="$id" $checked />};
         },
     },
+    WebBaseURL => Jifty->config->framework('Web')->{BaseURL},
     (map {
         my $value = RT->config->get($_);
         $_ => { value => sub { return \$value } };
     
-    } qw(WebPath WebBaseURL WebURL)),
+    } qw(WebPath WebURL)),
 };
 
 </%ONCE>

Modified: rt/3.999/trunk/share/html/Elements/ShowSearch
==============================================================================
--- rt/3.999/trunk/share/html/Elements/ShowSearch	(original)
+++ rt/3.999/trunk/share/html/Elements/ShowSearch	Mon May 18 05:28:06 2009
@@ -118,7 +118,8 @@
 );
 
 foreach ( $SearchArg, $ProcessedSearchArg ) {
-    $_->{'format'} =~ s/__(Web(?:Path|base|baseURL))__/scalar RT->config->get($1)/ge;
+    $_->{'format'} =~ s/__WebBaseURL__/Jifty->config->framework('Web')->{BaseURL}/ge;
+    $_->{'format'} =~ s/__(Web(?:Path|base))__/scalar RT->config->get($1)/ge;
     $_->{'format'} =~ s/__loc\(["']?(\w+)["']?\)__/_("$1")/ge;
     if ( $_->{'query'} =~ /__Bookmarks__/ ) {
         $_->{'rows'} = 999;