[Rt-commit] rt branch, 4.2/date-time-improvements-in-charts, updated. rt-3.8.10-120-g7fc00ce
Ruslan Zakirov
ruz at bestpractical.com
Tue Aug 30 02:05:49 EDT 2011
The branch, 4.2/date-time-improvements-in-charts has been updated
via 7fc00ce1e2e89df9887ad92461cf4d11d9d87599 (commit)
from 177b6bbe9eb6712bf77c9a10bbe2e1719f6600f5 (commit)
Summary of changes:
lib/RT/Report/Tickets.pm | 4 +++-
lib/RT/Report/Tickets/Entry.pm | 2 +-
share/html/Search/Elements/ChartTable | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
- Log -----------------------------------------------------------------
commit 7fc00ce1e2e89df9887ad92461cf4d11d9d87599
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Tue Aug 30 10:03:06 2011 +0400
query may have "naked OR", so wrap with ()
diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index 62ad4d8..95985f3 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -671,7 +671,9 @@ sub CalculatePostFunction {
foreach my $item ( @{ $self->{'items'} } ) {
$item->{'values'}{$column} = $code->(
$self,
- Query => join( ' AND ', grep defined && length, $base_query, $item->Query ),
+ Query => join(
+ ' AND ', map "($_)", grep defined && length, $base_query, $item->Query,
+ ),
);
$item->{'fetched'}{$column} = 1;
}
diff --git a/lib/RT/Report/Tickets/Entry.pm b/lib/RT/Report/Tickets/Entry.pm
index 7d140e2..34b1ba7 100644
--- a/lib/RT/Report/Tickets/Entry.pm
+++ b/lib/RT/Report/Tickets/Entry.pm
@@ -135,7 +135,7 @@ sub Query {
}
}
return () unless @parts;
- return join ' AND ', grep defined && length, @parts;
+ return join ' AND ', map "($_)", grep defined && length, @parts;
}
sub LabelCode {
diff --git a/share/html/Search/Elements/ChartTable b/share/html/Search/Elements/ChartTable
index ade045e..4ef13d7 100644
--- a/share/html/Search/Elements/ChartTable
+++ b/share/html/Search/Elements/ChartTable
@@ -43,7 +43,7 @@ foreach my $section (qw(thead tbody tfoot)) {
if ( my $q = $cell->{'query'} ) {
$m->out(
'<a href="'. RT->Config->Get('WebPath') .'/Search/Results.html'
- .'?Query='. $eu->(join ' AND ', grep defined && length, $Query, $q)
+ .'?Query='. $eu->(join ' AND ', map "($_)", grep defined && length, $Query, $q)
.'&'. $base_query
. '">'
);
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list