[freeside-commits] freeside/rt/share/html/Elements ColumnMap, 1.3, 1.4 RefreshHomepage, 1.2, 1.3

Ivan,,, ivan at wavetail.420.am
Sat Aug 14 17:44:57 PDT 2010


Update of /home/cvs/cvsroot/freeside/rt/share/html/Elements
In directory wavetail.420.am:/tmp/cvs-serv16313/rt/share/html/Elements

Modified Files:
	ColumnMap RefreshHomepage 
Log Message:
address root cause of rt/rt links and remove the workarounds, RT#9280

Index: ColumnMap
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/ColumnMap,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- ColumnMap	25 May 2010 11:11:55 -0000	1.3
+++ ColumnMap	15 Aug 2010 00:44:54 -0000	1.4
@@ -157,12 +157,7 @@
     
     } qw(WebPath WebBaseURL WebURL)),
     WebRequestPath    => { value => sub { substr( $m->request_path, 1 ) } },
-    #WebRequestPathDir => { value => sub { substr( $m->request_comp->dir_path, 1 ) } },
-    WebRequestPathDir => { value => sub {
-      my $wrpd = substr( $m->request_comp->dir_path, 1 );
-      $wrpd =~ s(^rt/)(); #hacky, dunno why this happens
-      $wrpd;
-    } },
+    WebRequestPathDir => { value => sub { substr( $m->request_comp->dir_path, 1 ) } },
 };
 
 $COLUMN_MAP->{'CF'} = $COLUMN_MAP->{'CustomField'};

Index: RefreshHomepage
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rt/share/html/Elements/RefreshHomepage,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- RefreshHomepage	23 Jul 2010 22:09:30 -0000	1.2
+++ RefreshHomepage	15 Aug 2010 00:44:54 -0000	1.3
@@ -46,13 +46,9 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <&|/Widgets/TitleBox, title => loc('Refresh')&>
-<form method="get" action="<% RT->Config->Get('WebPath') . $path %>">
+<form method="get" action="<% RT->Config->Get('WebPath') . $m->request_path %>">
 <& /Elements/Refresh, Name => 'HomeRefreshInterval', 
     Default => $session{'home_refresh_interval'}||RT->Config->Get('HomePageRefreshInterval', $session{'CurrentUser'}) &>
 <& /Elements/Submit,  Label => loc('Go!') &>
 </&>
 </form>
-<%init>
-my $path = $m->request_path;
-$path =~ s(^/rt)(); #hacky, dunno why this happens
-</%init>



More information about the freeside-commits mailing list