From 7515782ca6e453f2e4c9a52c62429e73ce047247 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 15 Aug 2010 00:44:55 +0000 Subject: address root cause of rt/rt links and remove the workarounds, RT#9280 --- rt/share/html/Elements/ColumnMap | 7 +------ rt/share/html/Elements/RT__CustomField/ColumnMap | 4 +--- rt/share/html/Elements/RefreshHomepage | 6 +----- 3 files changed, 3 insertions(+), 14 deletions(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/ColumnMap b/rt/share/html/Elements/ColumnMap index 6a1c23779..a1475a99d 100644 --- a/rt/share/html/Elements/ColumnMap +++ b/rt/share/html/Elements/ColumnMap @@ -157,12 +157,7 @@ my $COLUMN_MAP = { } 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'}; diff --git a/rt/share/html/Elements/RT__CustomField/ColumnMap b/rt/share/html/Elements/RT__CustomField/ColumnMap index 0a867eb26..6d8d76a4c 100644 --- a/rt/share/html/Elements/RT__CustomField/ColumnMap +++ b/rt/share/html/Elements/RT__CustomField/ColumnMap @@ -155,9 +155,7 @@ my $COLUMN_MAP = { : ($args->{'PassArguments'}); my %pass = map { $_ => $args->{$_} } grep exists $args->{$_}, @pass; - my $path = $m->request_path; - $path =~ s(^/rt)(); #hacky, dunno why this happens - my $uri = RT->Config->Get('WebPath') . $path; + my $uri = RT->Config->Get('WebPath') . $m->request_path; my @res = ( \' +
<& /Elements/Refresh, Name => 'HomeRefreshInterval', Default => $session{'home_refresh_interval'}||RT->Config->Get('HomePageRefreshInterval', $session{'CurrentUser'}) &> <& /Elements/Submit, Label => loc('Go!') &>
-<%init> -my $path = $m->request_path; -$path =~ s(^/rt)(); #hacky, dunno why this happens - -- cgit v1.2.1 From 2806e1967f8dbb7b15c41dd7c5bcc2eb121907f0 Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 15 Aug 2010 01:32:31 +0000 Subject: fix Dashboards edit link too, RT#9412 --- rt/share/html/Elements/Dashboards | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/Dashboards b/rt/share/html/Elements/Dashboards index 3653aa5b8..1a9c05299 100644 --- a/rt/share/html/Elements/Dashboards +++ b/rt/share/html/Elements/Dashboards @@ -51,7 +51,7 @@ title_href => RT->Config->Get('WebPath').'/Dashboards/index.html', bodyclass => "", titleright => loc("Edit"), - titleright_href => RT->Config->Get('WebPath').'/Dashboards/', + titleright_href => RT->Config->Get('WebPath').'/Dashboards/index.html', &> <& /Dashboards/Elements/ShowDashboards:table, -- cgit v1.2.1 From 4ccb0c66af7a6e5e3e4dc099078b08e1250226e5 Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 18 Aug 2010 00:14:10 +0000 Subject: fix directory links in RT (not picking up index.html as a default), RT#9665, fallout from RT#9412 --- rt/share/html/Elements/Dashboards | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/Dashboards b/rt/share/html/Elements/Dashboards index 1a9c05299..3653aa5b8 100644 --- a/rt/share/html/Elements/Dashboards +++ b/rt/share/html/Elements/Dashboards @@ -51,7 +51,7 @@ title_href => RT->Config->Get('WebPath').'/Dashboards/index.html', bodyclass => "", titleright => loc("Edit"), - titleright_href => RT->Config->Get('WebPath').'/Dashboards/index.html', + titleright_href => RT->Config->Get('WebPath').'/Dashboards/', &> <& /Dashboards/Elements/ShowDashboards:table, -- cgit v1.2.1 From 10cddd917072b9d148b30c7561db34b0133695f4 Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 26 Aug 2010 06:13:21 +0000 Subject: dashboard subscription fix --- rt/share/html/Elements/Header | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/Header b/rt/share/html/Elements/Header index d970ac52f..72e3e7220 100755 --- a/rt/share/html/Elements/Header +++ b/rt/share/html/Elements/Header @@ -45,14 +45,14 @@ %# those contributions and any derivatives thereof. %# %# END BPS TAGGED BLOCK }}} -<% include( '/elements/header.html', { +<& /elements/header.html, { 'title' => $Title, 'head' => $head, 'etc' => $etc, 'nobr' => 1, 'nocss' => 1, - }) |n -%> + } +&> <%INIT> $r->headers_out->{'Pragma'} = 'no-cache'; $r->headers_out->{'Cache-control'} = 'no-cache'; -- cgit v1.2.1 From c22410950cebc97f35091753a6e84d577bc6c5f3 Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 22 Oct 2010 18:03:47 +0000 Subject: add no_fuzzy_on_exact to RT customer search and our smart search boxes too, RT#10341 --- rt/share/html/Elements/AddCustomers | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/AddCustomers b/rt/share/html/Elements/AddCustomers index aaf8ca8ba..9828d7d53 100644 --- a/rt/share/html/Elements/AddCustomers +++ b/rt/share/html/Elements/AddCustomers @@ -39,7 +39,10 @@ warn "/Elements/AddCustomers called with CustomerString $CustomerString\n" my @Customers = (); if ( $CustomerString ) { - @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString ); + @Customers = &RT::URI::freeside::smart_search( + 'search' => $CustomerString, + 'no_fuzzy_on_exact' => 1, #pref? + ); } my @Services = (); -- cgit v1.2.1