fix rt/rt links moving custom fields up/down and refreshing homepage, RT#9280

diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index f11cd5c..f3360c1 100644 (file)
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -25,6 +25,8 @@ share/html/Elements/EditCustomFieldDate #customfield date patch (NEW)
  share/html/Elements/Header
  share/html/Elements/PageLayout
  #html/Elements/QuickCreate
+ share/html/Elements/RefreshHomepage
+ share/html/Elements/RT__CustomField/ColumnMap
  share/html/Elements/RT__Ticket/ColumnMap
  share/html/Elements/ShowCustomFieldDate #customfield date patch (NEW)
  share/html/Elements/SelectDate

diff --git a/rt/share/html/Elements/RT__CustomField/ColumnMap b/rt/share/html/Elements/RT__CustomField/ColumnMap
index 6d8d76a..0a867eb 100644 (file)
--- a/rt/share/html/Elements/RT__CustomField/ColumnMap
+++ b/rt/share/html/Elements/RT__CustomField/ColumnMap
@@ -155,7 +155,9 @@ my $COLUMN_MAP = {
                 : ($args->{'PassArguments'});
             my %pass = map { $_ => $args->{$_} } grep exists $args->{$_}, @pass;
 
-            my $uri = RT->Config->Get('WebPath') . $m->request_path;
+            my $path = $m->request_path;
+            $path =~ s(^/rt)(); #hacky, dunno why this happens
+            my $uri = RT->Config->Get('WebPath') . $path;
 
             my @res = (
                 \'<a href="',

diff --git a/rt/share/html/Elements/RefreshHomepage b/rt/share/html/Elements/RefreshHomepage
index bf91a95..7840f59 100644 (file)
--- a/rt/share/html/Elements/RefreshHomepage
+++ b/rt/share/html/Elements/RefreshHomepage
@@ -46,9 +46,13 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <&|/Widgets/TitleBox, title => loc('Refresh')&>
-<form method="get" action="<% RT->Config->Get('WebPath') . $m->request_path %>">
+<form method="get" action="<% RT->Config->Get('WebPath') . $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>