diff options
| -rw-r--r-- | Bugzilla/Bug.pm | 29 | ||||
| -rwxr-xr-x | process_bug.cgi | 8 |
2 files changed, 25 insertions, 12 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 80a4b5933..187b6a1dc 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1598,9 +1598,15 @@ sub _check_groups { } sub _check_keywords { - my ($invocant, $keyword_string, undef, $params) = @_; - $keyword_string = trim($keyword_string); - return [] if !$keyword_string; + my ($invocant, $keywords_in, undef, $params) = @_; + + return [] if !defined $keywords_in; + + my $keyword_array = $keywords_in; + if (!ref $keyword_array) { + $keywords_in = trim($keywords_in); + $keyword_array = [split(/[\s,]+/, $keywords_in)]; + } # On creation, only editbugs users can set keywords. if (!ref $invocant) { @@ -1609,7 +1615,7 @@ sub _check_keywords { } my %keywords; - foreach my $keyword (split(/[\s,]+/, $keyword_string)) { + foreach my $keyword (@$keyword_array) { next unless $keyword; my $obj = new Bugzilla::Keyword({ name => $keyword }); ThrowUserError("unknown_keyword", { keyword => $keyword }) if !$obj; @@ -2109,8 +2115,11 @@ sub set_all { } if (exists $params->{'keywords'}) { - $self->modify_keywords($params->{'keywords'}, - $params->{'keywords_action'}); + # Sorting makes the order "add, remove, set", just like for other + # fields. + foreach my $action (sort keys %{ $params->{'keywords'} }) { + $self->modify_keywords($params->{'keywords'}->{$action}, $action); + } } if (exists $params->{'comment'} or exists $params->{'work_time'}) { @@ -2622,15 +2631,15 @@ sub add_comment { sub modify_keywords { my ($self, $keywords, $action) = @_; - $action ||= "makeexact"; - if (!grep($action eq $_, qw(add delete makeexact))) { - $action = "makeexact"; + $action ||= 'set'; + if (!grep($action eq $_, qw(add remove set))) { + $action = 'set'; } $keywords = $self->_check_keywords($keywords); my (@result, $any_changes); - if ($action eq 'makeexact') { + if ($action eq 'set') { @result = @$keywords; # Check if anything was added or removed. my @old_ids = map { $_->id } @{$self->keyword_objects}; diff --git a/process_bug.cgi b/process_bug.cgi index 5e6657939..7759d03dc 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -234,7 +234,6 @@ my @set_fields = qw(op_sys rep_platform priority bug_severity bug_file_loc status_whiteboard short_desc deadline remaining_time estimated_time work_time set_default_assignee set_default_qa_contact - keywords keywordaction cclist_accessible reporter_accessible product confirm_product_change bug_status resolution dup_id); @@ -247,7 +246,6 @@ my %field_translation = ( bug_file_loc => 'url', set_default_assignee => 'reset_assigned_to', set_default_qa_contact => 'reset_qa_contact', - keywordaction => 'keywords_action', confirm_product_change => 'product_change_confirmed', ); @@ -259,6 +257,12 @@ foreach my $field_name (@set_fields) { } } +if (should_set('keywords')) { + my $action = $cgi->param('keywordaction'); + $action = 'remove' if $action eq 'delete'; + $action = 'set' if $action eq 'makeexact'; + $set_all_fields{keywords}->{$action} = $cgi->param('keywords'); +} if (should_set('comment')) { $set_all_fields{comment} = { body => scalar $cgi->param('comment'), |