summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-02-15 09:15:40 +0100
committerByron Jones <bjones@mozilla.com>2013-02-15 09:15:40 +0100
commit60c806ad7aaa6da20c20d93e352eab0c22c9d4df (patch)
treeb06fa93864aa856a19a5b58df00f73954f387ea1 /Bugzilla
parent8b9a291b37e2f2e40caa3fca256a510ce44f42ed (diff)
downloadbugzilla-60c806ad7aaa6da20c20d93e352eab0c22c9d4df.tar.gz
bugzilla-60c806ad7aaa6da20c20d93e352eab0c22c9d4df.tar.xz
Bug 828344: Fix comment "contains all of the words" behavour
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Search.pm39
1 files changed, 38 insertions, 1 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index e89e86bc5..d2148a9c2 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -293,10 +293,10 @@ use constant OPERATOR_FIELD_OVERRIDE => {
keywords => MULTI_SELECT_OVERRIDE,
'flagtypes.name' => MULTI_SELECT_OVERRIDE,
longdesc => {
- %{ MULTI_SELECT_OVERRIDE() },
changedby => \&_long_desc_changedby,
changedbefore => \&_long_desc_changedbefore_after,
changedafter => \&_long_desc_changedbefore_after,
+ _non_changed => \&_long_desc_nonchanged,
},
'longdescs.count' => {
changedby => \&_long_desc_changedby,
@@ -2359,6 +2359,43 @@ sub _long_desc_changedbefore_after {
}
}
+sub _long_desc_nonchanged {
+ my ($self, $args) = @_;
+ my ($chart_id, $operator, $value, $joins, $bugs_table) =
+ @$args{qw(chart_id operator value joins bugs_table)};
+ my $dbh = Bugzilla->dbh;
+
+ my $table = "longdescs_$chart_id";
+ my $join_args = {
+ chart_id => $chart_id,
+ sequence => $chart_id,
+ field => 'longdesc',
+ full_field => "$table.thetext",
+ operator => $operator,
+ value => $value,
+ all_values => $value,
+ quoted => $dbh->quote($value),
+ joins => [],
+ bugs_table => $bugs_table,
+ };
+ $self->_do_operator_function($join_args);
+
+ # If the user is not part of the insiders group, they cannot see
+ # private comments
+ if (!$self->_user->is_insider) {
+ $join_args->{term} .= " AND $table.isprivate = 0";
+ }
+
+ my $join = {
+ table => 'longdescs',
+ as => $table,
+ extra => [ $join_args->{term} ],
+ };
+ push(@$joins, $join);
+
+ $args->{term} = "$table.comment_id IS NOT NULL";
+}
+
sub _content_matches {
my ($self, $args) = @_;
my ($chart_id, $joins, $fields, $operator, $value) =