summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search.pm2
-rw-r--r--xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm14
2 files changed, 15 insertions, 1 deletions
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 73235ded3..edb59e40e 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -945,6 +945,8 @@ sub _sql_limit {
sub _column_join {
my ($self, $field) = @_;
+ # The _realname fields require the same join as the username fields.
+ $field =~ s/_realname$//;
my $join_info = COLUMN_JOINS->{$field};
if ($join_info) {
# Don't allow callers to modify the constant.
diff --git a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm b/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
index b891c1587..1e0a75f95 100644
--- a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
+++ b/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
@@ -58,6 +58,18 @@ sub name {
return "$name (Normal Params)";
}
+sub search_columns {
+ my $self = shift;
+ my $field = $self->field;
+ # For the assigned_to, qa_contact, and reporter fields, have the
+ # "Normal Params" test check that the _realname columns work
+ # all by themselves.
+ if (grep($_ eq $field, EMAIL_FIELDS) && $self->field_object->buglist) {
+ return ['bug_id', "${field}_realname"]
+ }
+ return $self->SUPER::search_columns(@_);
+}
+
sub search_params {
my ($self) = @_;
my $field = $self->field;
@@ -103,4 +115,4 @@ sub search_params {
return { $field => $value, "${field}_type" => $operator };
}
-1; \ No newline at end of file
+1;