Skip to content

Commit

Permalink
Bug 1918771 - Support pronouns such as %user% in "changed by" searches
Browse files Browse the repository at this point in the history
  • Loading branch information
@dklawren
dklawren committed Sep 13, 2024
1 parent a9a610f commit a9c241a
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 83 deletions.
118 changes: 36 additions & 82 deletions Bugzilla/Search.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ sub SPECIAL_PARSING {
# Pronoun Fields (Ones that can accept %user%, etc.)
assigned_to => \&_contact_pronoun,
'attachments.submitter' => \&_contact_pronoun,
cc => \&_cc_pronoun,
commenter => \&_commenter_pronoun,
cc => \&_contact_pronoun,
commenter => \&_contact_pronoun,
qa_contact => \&_contact_pronoun,
reporter => \&_contact_pronoun,
'requestees.login_name' => \&_contact_pronoun,
Expand Down Expand Up @@ -1773,7 +1773,7 @@ sub _special_parse_email {
my $email = trim($params->{"email$id"});
next if !$email;
my $type = $params->{"emailtype$id"} || 'anyexact';
$type = "anyexact" if $type eq "exact";
$type = "equals" if $type eq "exact";

my $or_clause = new Bugzilla::Search::Clause('OR');
foreach my $field (qw(assigned_to reporter cc qa_contact bug_mentor)) {
Expand Down Expand Up @@ -2445,8 +2445,8 @@ sub _contact_pronoun {

sub _contact_exact_group {
my ($self, $args) = @_;
my ($value, $operator, $field, $chart_id, $joins)
= @$args{qw(value operator field chart_id joins)};
my ($value, $operator, $field, $chart_id, $joins, $sequence)
= @$args{qw(value operator field chart_id joins sequence)};
my $dbh = Bugzilla->dbh;
my $user = $self->_user;

Expand All @@ -2466,11 +2466,29 @@ sub _contact_exact_group {
$group->check_members_are_visible();

my $group_ids = Bugzilla::Group->flatten_group_membership($group->id);

if ($field eq 'cc' && $chart_id eq '') {
# This is for the email1, email2, email3 fields from query.cgi.
$chart_id = "CC$$sequence";
$args->{sequence}++;
}

my $from = $field;

# These fields need an additional table.
if ($field =~ /^(commenter|cc)$/) {
my $join_table = $field;
$join_table = 'longdescs' if $field eq 'commenter';
my $join_table_alias = "${field}_$chart_id";
push(@$joins, {table => $join_table, as => $join_table_alias});
$from = "$join_table_alias.who";
}

my $table = "user_group_map_$chart_id";
my $join = {
table => 'user_group_map',
as => $table,
from => $field,
from => $from,
to => 'user_id',
extra => [$dbh->sql_in("$table.group_id", $group_ids), "$table.isbless = 0"],
};
Expand All @@ -2483,79 +2501,6 @@ sub _contact_exact_group {
}
}

sub _cc_pronoun {
my ($self, $args) = @_;
my ($full_field, $value) = @$args{qw(full_field value)};
my $user = $self->_user;

if ($value =~ /\%group/) {
return $self->_cc_exact_group($args);
}
elsif ($value =~ /^(%\w+%)$/) {
$args->{value} = pronoun($1, $user);
$args->{quoted} = $args->{value};
$args->{value_is_id} = 1;
}
}

sub _cc_exact_group {
my ($self, $args) = @_;
my ($chart_id, $sequence, $joins, $operator, $value)
= @$args{qw(chart_id sequence joins operator value)};
my $user = $self->_user;
my $dbh = Bugzilla->dbh;

$value =~ m/%group\.([^%]+)%/;
my $group
= Bugzilla::Group->check({name => $1, _error => 'invalid_group_name'});
$group->check_members_are_visible();
$user->in_group($group)
|| ThrowUserError('invalid_group_name', {name => $group->name});

my $all_groups = Bugzilla::Group->flatten_group_membership($group->id);

# This is for the email1, email2, email3 fields from query.cgi.
if ($chart_id eq "") {
$chart_id = "CC$$sequence";
$args->{sequence}++;
}

my $cc_table = "cc_$chart_id";
push(@$joins, {table => 'cc', as => $cc_table});
my $group_table = "user_group_map_$chart_id";
my $group_join = {
table => 'user_group_map',
as => $group_table,
from => "$cc_table.who",
to => 'user_id',
extra => [
$dbh->sql_in("$group_table.group_id", $all_groups),
"$group_table.isbless = 0"
],
};
push(@$joins, $group_join);

if ($operator =~ /^not/) {
$args->{term} = "$group_table.group_id IS NULL";
}
else {
$args->{term} = "$group_table.group_id IS NOT NULL";
}
}

# XXX This should probably be merged with cc_pronoun.
sub _commenter_pronoun {
my ($self, $args) = @_;
my $value = $args->{value};
my $user = $self->_user;

if ($value =~ /^(%\w+%)$/) {
$args->{value} = pronoun($1, $user);
$args->{quoted} = $args->{value};
$args->{value_is_id} = 1;
}
}

# XXX only works with %user% currently
sub _triage_owner_pronoun {
my ($self, $args) = @_;
Expand All @@ -2573,6 +2518,15 @@ sub _triage_owner_pronoun {
}
}

sub _get_user_id {
my ($self, $value) = @_;

if ($value =~ /^%\w+%$/) {
return pronoun($value, $self->_user);
}
return login_to_id($value, THROW_ERROR);
}

######################################
# "Special Parsing" Functions: Misc. #
######################################
Expand Down Expand Up @@ -2728,7 +2682,7 @@ sub _long_desc_changedby {

my $table = "longdescs_$chart_id";
push(@$joins, {table => 'longdescs', as => $table});
my $user_id = login_to_id($value, THROW_ERROR);
my $user_id = i$self->_get_user_id($value);
$args->{term} = "$table.who = $user_id";
}

Expand Down Expand Up @@ -2896,7 +2850,7 @@ sub _work_time_changedby {

my $table = "longdescs_$chart_id";
push(@$joins, {table => 'longdescs', as => $table});
my $user_id = login_to_id($value, THROW_ERROR);
my $user_id = $self->_get_user_id($value);
$args->{term} = "$table.who = $user_id AND $table.work_time != 0";
}

Expand Down Expand Up @@ -3695,7 +3649,7 @@ sub _changedby {
push(@{$join->{extra}}, "$table.fieldid = $field_id");
}

my $user_id = login_to_id($value, THROW_ERROR);
my $user_id = $self->_get_user_id($value);
push(@{$join->{extra}}, "$table.who = $user_id");

$args->{term} = "$table.bug_when IS NOT NULL";
Expand Down
2 changes: 1 addition & 1 deletion template/en/default/search/form.html.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ TUI_hide_default('custom_search_query');
[% FOREACH qv = [
{ name => "substring", description => "contains" },
{ name => "notsubstring", description => "doesn't contain" },
{ name => "exact", description => "is" },
{ name => "equals", description => "is" },
{ name => "notequals", description => "is not" },
{ name => "regexp", description => "matches regexp" },
{ name => "notregexp", description => "doesn't match regexp" } ] %]
Expand Down

0 comments on commit a9c241a

Please sign in to comment.