projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
ShowSearch
diff --git
a/rt/share/html/Elements/ShowSearch
b/rt/share/html/Elements/ShowSearch
index
4b96bbf
..
20ce55b
100644
(file)
--- a/
rt/share/html/Elements/ShowSearch
+++ b/
rt/share/html/Elements/ShowSearch
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
2
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-46,7
+46,7
@@
%#
%# END BPS TAGGED BLOCK }}}
<&|/Widgets/TitleBox,
%#
%# END BPS TAGGED BLOCK }}}
<&|/Widgets/TitleBox,
- title => loc(
$desc
, $ProcessedSearchArg->{'Rows'}),
+ title => loc(
RT::SavedSearch->EscapeDescription($search->Description)
, $ProcessedSearchArg->{'Rows'}),
title_href => $query_link_url.$QueryString,
titleright => $customize ? loc('Edit') : '',
titleright_href => $customize,
title_href => $query_link_url.$QueryString,
titleright => $customize ? loc('Edit') : '',
titleright_href => $customize,
@@
-125,10
+125,7
@@
foreach ( $SearchArg, $ProcessedSearchArg ) {
$_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge;
# extract-message-catalog would "$1", so we avoid quotes for loc calls
$_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/my $f = "$1"; loc($f)/ge;
$_->{'Format'} =~ s/__(Web(?:Path|Base|BaseURL))__/scalar RT->Config->Get($1)/ge;
# extract-message-catalog would "$1", so we avoid quotes for loc calls
$_->{'Format'} =~ s/__loc\(["']?(\w+)["']?\)__/my $f = "$1"; loc($f)/ge;
- if ( $_->{'Query'} =~ /__Bookmarked__/ ) {
- $_->{'Rows'} = 999;
- }
- elsif ( $_->{'Query'} =~ /__Bookmarks__/ ) {
+ if ( $_->{'Query'} =~ /__Bookmarks__/ ) {
$_->{'Rows'} = 999;
# DEPRECATED: will be here for a while up to 3.10/4.0
$_->{'Rows'} = 999;
# DEPRECATED: will be here for a while up to 3.10/4.0
@@
-141,14
+138,6
@@
foreach ( $SearchArg, $ProcessedSearchArg ) {
}
my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg );
}
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
</%init>
<%ARGS>
$Name => undef