diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2012-06-07 00:56:06 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2012-06-07 00:56:06 -0700 |
| commit | 43a06151e47d2c59b833cbd8c26d97865ee850b6 (patch) | |
| tree | 42c51d94e7fa265461b508d061562be204ccc2c1 /rt/share/html/Elements/ShowSearch | |
| parent | 6587f6ba7d047ddc1686c080090afe7d53365bd4 (diff) | |
starting to work...
Diffstat (limited to 'rt/share/html/Elements/ShowSearch')
| -rw-r--r-- | rt/share/html/Elements/ShowSearch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/rt/share/html/Elements/ShowSearch b/rt/share/html/Elements/ShowSearch index 904c82760..2b23181c2 100644 --- a/rt/share/html/Elements/ShowSearch +++ b/rt/share/html/Elements/ShowSearch @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -46,7 +46,7 @@ %# %# END BPS TAGGED BLOCK }}} <&|/Widgets/TitleBox, - title => loc($search->Description, $ProcessedSearchArg->{'Rows'}), + title => loc($desc, $ProcessedSearchArg->{'Rows'}), title_href => $query_link_url.$QueryString, titleright => $customize ? loc('Edit') : '', titleright_href => $customize, @@ -72,6 +72,7 @@ if ($SavedSearch) { $m->out(loc("Saved Search [_1] not found", $SavedSearch)) unless $IgnoreMissing; return; } + $SearchArg->{'SavedSearchId'} ||= $SavedSearch; $SearchArg->{'SearchType'} ||= 'Ticket'; if ( $SearchArg->{SearchType} ne 'Ticket' ) { @@ -119,6 +120,7 @@ $m->callback( foreach ( $SearchArg, $ProcessedSearchArg ) { $_->{'Format'} ||= ''; + $_->{'Query'} ||= ''; $_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge; # extract-message-catalog would "$1", so we avoid quotes for loc calls @@ -140,6 +142,13 @@ foreach ( $SearchArg, $ProcessedSearchArg ) { my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg ); +my $desc = $search->Description; + +# we only use [_1] here, let's escape other "[" and "]" unless they are +# escaped already +$desc =~ s/(?<!~)\[(?!_1\])/~[/g; +$desc =~ s/(?<!~)(?<!\[_1)\]/~]/g; + </%init> <%ARGS> $Name => undef |