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
904c827
..
4b96bbf
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
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
2
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($
search->Description
, $ProcessedSearchArg->{'Rows'}),
+ title => loc($
desc
, $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,
@@
-64,21
+64,22
@@
my $query_link_url = RT->Config->Get('WebPath').'/Search/Results.html';
if ($SavedSearch) {
my ( $container_object, $search_id ) = _parse_saved_search($SavedSearch);
unless ( $container_object ) {
if ($SavedSearch) {
my ( $container_object, $search_id ) = _parse_saved_search($SavedSearch);
unless ( $container_object ) {
- $m->out(loc("Either you have no rights to view saved search [_1] or identifier is incorrect", $
SavedSearch
));
+ $m->out(loc("Either you have no rights to view saved search [_1] or identifier is incorrect", $
m->interp->apply_escapes($SavedSearch, 'h')
));
return;
}
$search = $container_object->Attributes->WithId($search_id);
unless ( $search->Id && ref( $SearchArg = $search->Content ) eq 'HASH' ) {
return;
}
$search = $container_object->Attributes->WithId($search_id);
unless ( $search->Id && ref( $SearchArg = $search->Content ) eq 'HASH' ) {
- $m->out(loc("Saved Search [_1] not found", $
SavedSearch
)) unless $IgnoreMissing;
+ $m->out(loc("Saved Search [_1] not found", $
m->interp->apply_escapes($SavedSearch, 'h')
)) unless $IgnoreMissing;
return;
}
return;
}
+ $SearchArg->{'SavedSearchId'} ||= $SavedSearch;
$SearchArg->{'SearchType'} ||= 'Ticket';
if ( $SearchArg->{SearchType} ne 'Ticket' ) {
# XXX: dispatch to different handler here
$query_display_component
= '/Search/Elements/' . $SearchArg->{SearchType};
$SearchArg->{'SearchType'} ||= 'Ticket';
if ( $SearchArg->{SearchType} ne 'Ticket' ) {
# XXX: dispatch to different handler here
$query_display_component
= '/Search/Elements/' . $SearchArg->{SearchType};
- $query_link_url = RT->Config->Get('Web
URL
') . "/Search/$SearchArg->{SearchType}.html";
+ $query_link_url = RT->Config->Get('Web
Path
') . "/Search/$SearchArg->{SearchType}.html";
} elsif ($ShowCustomize) {
$customize = RT->Config->Get('WebPath') . '/Search/Build.html?'
. $m->comp( '/Elements/QueryString',
} elsif ($ShowCustomize) {
$customize = RT->Config->Get('WebPath') . '/Search/Build.html?'
. $m->comp( '/Elements/QueryString',
@@
-92,7
+93,7
@@
if ($SavedSearch) {
if ($custom->Description eq $Name) { $search = $custom; last }
}
unless ($search && $search->id) {
if ($custom->Description eq $Name) { $search = $custom; last }
}
unless ($search && $search->id) {
- $m->out(
"Predefined search $Name not found"
);
+ $m->out(
loc("Predefined search [_1] not found", $m->interp->apply_escapes($Name, 'h'))
);
return;
}
}
return;
}
}
@@
-119,6
+120,7
@@
$m->callback(
foreach ( $SearchArg, $ProcessedSearchArg ) {
$_->{'Format'} ||= '';
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
$_->{'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 $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