diff options
| -rwxr-xr-x | Bugzilla/Bug.pm | 213 | ||||
| -rwxr-xr-x | process_bug.cgi | 31 |
2 files changed, 99 insertions, 145 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 6223320d6..5694ac351 100755 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -523,6 +523,89 @@ sub update { } } + # CC + my @old_cc = map {$_->id} @{$old_bug->cc_users}; + my @new_cc = map {$_->id} @{$self->cc_users}; + my ($removed_cc, $added_cc) = diff_arrays(\@old_cc, \@new_cc); + + if (scalar @$removed_cc) { + $dbh->do('DELETE FROM cc WHERE bug_id = ? AND ' + . $dbh->sql_in('who', $removed_cc), undef, $self->id); + } + foreach my $user_id (@$added_cc) { + $dbh->do('INSERT INTO cc (bug_id, who) VALUES (?,?)', + undef, $self->id, $user_id); + } + # If any changes were found, record it in the activity log + if (scalar @$removed_cc || scalar @$added_cc) { + my $removed_users = Bugzilla::User->new_from_list($removed_cc); + my $added_users = Bugzilla::User->new_from_list($added_cc); + my $removed_names = join(', ', (map {$_->login} @$removed_users)); + my $added_names = join(', ', (map {$_->login} @$added_users)); + $changes->{cc} = [$removed_names, $added_names]; + } + + # Keywords + my @old_kw_ids = map { $_->id } @{$old_bug->keyword_objects}; + my @new_kw_ids = map { $_->id } @{$self->keyword_objects}; + + my ($removed_kw, $added_kw) = diff_arrays(\@old_kw_ids, \@new_kw_ids); + + if (scalar @$removed_kw) { + $dbh->do('DELETE FROM keywords WHERE bug_id = ? AND ' + . $dbh->sql_in('keywordid', $removed_kw), undef, $self->id); + } + foreach my $keyword_id (@$added_kw) { + $dbh->do('INSERT INTO keywords (bug_id, keywordid) VALUES (?,?)', + undef, $self->id, $keyword_id); + } + $dbh->do('UPDATE bugs SET keywords = ? WHERE bug_id = ?', undef, + $self->keywords, $self->id); + # If any changes were found, record it in the activity log + if (scalar @$removed_kw || scalar @$added_kw) { + my $removed_keywords = Bugzilla::Keyword->new_from_list($removed_kw); + my $added_keywords = Bugzilla::Keyword->new_from_list($added_kw); + my $removed_names = join(', ', (map {$_->name} @$removed_keywords)); + my $added_names = join(', ', (map {$_->name} @$added_keywords)); + $changes->{keywords} = [$removed_names, $added_names]; + } + + # Dependencies + foreach my $pair ([qw(dependson blocked)], [qw(blocked dependson)]) { + my ($type, $other) = @$pair; + my $old = $old_bug->$type; + my $new = $self->$type; + + my ($removed, $added) = diff_arrays($old, $new); + foreach my $removed_id (@$removed) { + $dbh->do("DELETE FROM dependencies WHERE $type = ? AND $other = ?", + undef, $removed_id, $self->id); + + # Add an activity entry for the other bug. + LogActivityEntry($removed_id, $other, $self->id, '', + Bugzilla->user->id, $delta_ts); + # Update delta_ts on the other bug so that we trigger mid-airs. + $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', + undef, $delta_ts, $removed_id); + } + foreach my $added_id (@$added) { + $dbh->do("INSERT INTO dependencies ($type, $other) VALUES (?,?)", + undef, $added_id, $self->id); + + # Add an activity entry for the other bug. + LogActivityEntry($added_id, $other, '', $self->id, + Bugzilla->user->id, $delta_ts); + # Update delta_ts on the other bug so that we trigger mid-airs. + $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', + undef, $delta_ts, $added_id); + } + + if (scalar(@$removed) || scalar(@$added)) { + $changes->{$type} = [join(', ', @$removed), join(', ', @$added)]; + } + } + + # Groups my %old_groups = map {$_->id => $_} @{$old_bug->groups_in}; my %new_groups = map {$_->id => $_} @{$self->groups_in}; my ($removed_gr, $added_gr) = diff_arrays([keys %old_groups], @@ -545,6 +628,7 @@ sub update { join(', ', @added_names)]; } + # Comments foreach my $comment (@{$self->{added_comments} || []}) { my $columns = join(',', keys %$comment); my @values = values %$comment; @@ -644,135 +728,6 @@ sub _extract_multi_selects { return \%ms_values; } -# XXX Temporary hack until all of process_bug uses update(). -sub update_cc { - my $self = shift; - - my $dbh = Bugzilla->dbh; - my $delta_ts = shift || $dbh->selectrow_array("SELECT NOW()"); - - my $old_bug = $self->new($self->id); - my @old_cc = map {$_->id} @{$old_bug->cc_users}; - my @new_cc = map {$_->id} @{$self->cc_users}; - my ($removed, $added) = diff_arrays(\@old_cc, \@new_cc); - - if (scalar @$removed) { - $dbh->do('DELETE FROM cc WHERE bug_id = ? AND ' - . $dbh->sql_in('who', $removed), undef, $self->id); - } - foreach my $user_id (@$added) { - $dbh->do('INSERT INTO cc (bug_id, who) VALUES (?,?)', - undef, $self->id, $user_id); - } - my $removed_users = Bugzilla::User->new_from_list($removed); - my $added_users = Bugzilla::User->new_from_list($added); - - # If any changes were found, record it in the activity log - if (scalar @$removed || scalar @$added) { - my $removed_names = join(', ', (map {$_->login} @$removed_users)); - my $added_names = join(', ', (map {$_->login} @$added_users)); - LogActivityEntry($self->id, "cc", $removed_names, $added_names, - Bugzilla->user->id, $delta_ts); - } - - return ($removed_users, $added_users); -} - -# XXX Temporary hack until all of process_bug uses update() -sub update_dependencies { - # We need to send mail for dependson/blocked bugs if the dependencies - # change or the status or resolution change. This var keeps track of that. - my $check_dep_bugs = 0; - - my $self = shift; - - my $dbh = Bugzilla->dbh; - my $delta_ts = shift || $dbh->selectrow_array("SELECT NOW()"); - - my $old_bug = $self->new($self->id); - - my %changes; - foreach my $pair ([qw(dependson blocked)], [qw(blocked dependson)]) { - my ($type, $other) = @$pair; - my $old = $old_bug->$type; - my $new = $self->$type; - - my ($removed, $added) = diff_arrays($old, $new); - foreach my $removed_id (@$removed) { - $dbh->do("DELETE FROM dependencies WHERE $type = ? AND $other = ?", - undef, $removed_id, $self->id); - - # Add an activity entry for the other bug. - LogActivityEntry($removed_id, $other, $self->id, '', - Bugzilla->user->id, $delta_ts); - # Update delta_ts on the other bug so that we trigger mid-airs. - $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', - undef, $delta_ts, $removed_id); - } - foreach my $added_id (@$added) { - $dbh->do("INSERT INTO dependencies ($type, $other) VALUES (?,?)", - undef, $added_id, $self->id); - - # Add an activity entry for the other bug. - LogActivityEntry($added_id, $other, '', $self->id, - Bugzilla->user->id, $delta_ts); - # Update delta_ts on the other bug so that we trigger mid-airs. - $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', - undef, $delta_ts, $added_id); - } - - LogActivityEntry($self->id, $type, join(', ', @$removed), - join(', ', @$added), Bugzilla->user->id, $delta_ts); - - $changes{$type} = [$removed, $added]; - } - - return \%changes; -} - -# XXX Temporary hack until all of process_bug uses update() -sub update_keywords { - my $self = shift; - - my $dbh = Bugzilla->dbh; - my $delta_ts = shift || $dbh->selectrow_array("SELECT NOW()"); - - my $old_bug = $self->new($self->id); - my @old_ids = map { $_->id } @{$old_bug->keyword_objects}; - my @new_ids = map { $_->id } @{$self->keyword_objects}; - - my ($removed, $added) = diff_arrays(\@old_ids, \@new_ids); - - if (scalar @$removed) { - $dbh->do('DELETE FROM keywords WHERE bug_id = ? AND ' - . $dbh->sql_in('keywordid', $removed), undef, $self->id); - } - foreach my $keyword_id (@$added) { - $dbh->do('INSERT INTO keywords (bug_id, keywordid) VALUES (?,?)', - undef, $self->id, $keyword_id); - } - - $dbh->do('UPDATE bugs SET keywords = ? WHERE bug_id = ?', undef, - $self->keywords, $self->id); - - my $removed_keywords = Bugzilla::Keyword->new_from_list($removed); - my $added_keywords = Bugzilla::Keyword->new_from_list($added); - - # If any changes were found, record it in the activity log - if (scalar @$removed || scalar @$added) { - my $removed_names = join(', ', (map {$_->name} @$removed_keywords)); - my $added_names = join(', ', (map {$_->name} @$added_keywords)); - LogActivityEntry($self->id, "keywords", $removed_names, - $added_names, Bugzilla->user->id, $delta_ts); - - $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?', - undef, ($delta_ts, $self->id)); - $self->{delta_ts} = $delta_ts; - } - - return [$removed_keywords, $added_keywords]; -} - # Should be called any time you update short_desc or change a comment. sub _sync_fulltext { my ($self, $new_bug) = @_; diff --git a/process_bug.cgi b/process_bug.cgi index 277cbb0fd..ffa06cee3 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -542,19 +542,17 @@ foreach my $bug (@bug_objects) { } } - $bug->update_keywords($timestamp); - - my ($cc_removed) = $bug->update_cc($timestamp); - $cc_removed = [map {$_->login} @$cc_removed]; - - my ($dep_changes) = $bug->update_dependencies($timestamp); - - # Convert the "changes" hash into a list of all the bug ids, then - # convert that into a hash to eliminate duplicates. ("map {@$_}" collapses - # an array of arrays.) - my @all_changed_deps = map { @$_ } @{$dep_changes->{'dependson'}}; - push(@all_changed_deps, map { @$_ } @{$dep_changes->{'blocked'}}); - my %changed_deps = map { $_ => 1 } @all_changed_deps; + # To get a list of all changed dependencies, convert the "changes" arrays + # into a long string, then collapse that string into unique numbers in + # a hash. + my $all_changed_deps = join(', ', @{ $changes->{'dependson'} || [] }); + $all_changed_deps = join(', ', @{ $changes->{'blocked'} || [] }, + $all_changed_deps); + my %changed_deps = map { $_ => 1 } split(', ', $all_changed_deps); + # When clearning one field (say, blocks) and filling in the other + # (say, dependson), an empty string can get into the hash and cause + # an error later. + delete $changed_deps{''}; # $msgs will store emails which have to be sent to voters, if any. my $msgs; @@ -582,10 +580,11 @@ foreach my $bug (@bug_objects) { MessageToMTA($msg); } - my $old_qa = $changes->{'qa_contact'} ? $changes->{'qa_contact'}->[0] : ''; - my $old_own = $changes->{'assigned_to'} ? $changes->{'assigned_to'}->[0] : ''; + my $old_qa = $changes->{'qa_contact'} ? $changes->{'qa_contact'}->[0] : ''; + my $old_own = $changes->{'assigned_to'} ? $changes->{'assigned_to'}->[0] : ''; + my $old_cc = $changes->{cc} ? $changes->{cc}->[0] : ''; $vars->{'mailrecipients'} = { - cc => $cc_removed, + cc => [split(/[\s,]+/, $old_cc)], owner => $old_own, qacontact => $old_qa, changer => Bugzilla->user->login }; |