summaryrefslogtreecommitdiff
path: root/rt
diff options
context:
space:
mode:
authorivan <ivan>2010-07-23 22:09:30 +0000
committerivan <ivan>2010-07-23 22:09:30 +0000
commitc6a3eafdce6e88b4f33a37a824331d5d9be8d9bd (patch)
tree33c86051952ba7a3f309f7e4f96bb8ee34a6f49f /rt
parent22e59cf0fddecd4808a6ce91fe2b1712f3ab3c87 (diff)
fix rt/rt links moving custom fields up/down and refreshing homepage, RT#9280
Diffstat (limited to 'rt')
-rw-r--r--rt/FREESIDE_MODIFIED2
-rw-r--r--rt/share/html/Elements/RT__CustomField/ColumnMap4
-rw-r--r--rt/share/html/Elements/RefreshHomepage6
3 files changed, 10 insertions, 2 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index f11cd5cfc..f3360c1f6 100644
--- 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 6d8d76a4c..0a867eb26 100644
--- 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 bf91a9522..7840f59cc 100644
--- 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>