Skip to content

bugzilla
bugzilla
Commit 4d718011 authored by travis%sedsystems.ca's avatar travis%sedsystems.ca
Browse files
Options

Bug 180652 : Marking an attachment as obsolete should cancel all unfulfilled requests

Patch by Frederic Buclin <LpSolit@gmail.com> r=myk a=myk
parent edb8d829
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 59 deletions
Bugzilla/Flag.pm
View file @ 4d718011
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# #
# Contributor(s): Myk Melez <myk@mozilla.org> # Contributor(s): Myk Melez <myk@mozilla.org>
# Jouni Heikniemi <jouni@heikniemi.net> # Jouni Heikniemi <jouni@heikniemi.net>
# Frédéric Buclin <LpSolit@gmail.com>
################################################################################ ################################################################################
# Module Initialization # Module Initialization
...@@ -236,33 +237,47 @@ sub validate { ...@@ -236,33 +237,47 @@ sub validate {
} }
} }
sub snapshot {
my ($bug_id, $attach_id) = @_;
my $flags = match({ 'bug_id' => $bug_id,
'attach_id' => $attach_id,
'is_active' => 1 });
my @summaries;
foreach my $flag (@$flags) {
my $summary = $flag->{'type'}->{'name'} . $flag->{'status'};
$summary .= "(" . $flag->{'requestee'}->login . ")" if $flag->{'requestee'};
push(@summaries, $summary);
}
return @summaries;
}
sub process { sub process {
# Processes changes to flags. # Processes changes to flags.
# The target is the bug or attachment this flag is about, the timestamp # The target is the bug or attachment this flag is about, the timestamp
# is the date/time the bug was last touched (so that changes to the flag # is the date/time the bug was last touched (so that changes to the flag
# can be stamped with the same date/time), the data is the form data # can be stamped with the same date/time), and the data is the form data
# with flag fields that the user submitted, the old bug is the bug record # with flag fields that the user submitted.
# before the user made changes to it, and the new bug is the bug record
# after the user made changes to it.
my ($target, $timestamp, $data, $oldbug, $newbug) = @_; my ($target, $timestamp, $data) = @_;
my $dbh = Bugzilla->dbh;
my $bug_id = $target->{'bug'}->{'id'};
my $attach_id = $target->{'attachment'}->{'id'};
# Use the date/time we were given if possible (allowing calling code # Use the date/time we were given if possible (allowing calling code
# to synchronize the comment's timestamp with those of other records). # to synchronize the comment's timestamp with those of other records).
$timestamp = ($timestamp ? &::SqlQuote($timestamp) : "NOW()"); $timestamp = ($timestamp ? &::SqlQuote($timestamp) : "NOW()");
# Take a snapshot of flags before any changes. # Take a snapshot of flags before any changes.
my $flags = match({ 'bug_id' => $target->{'bug'}->{'id'} , my @old_summaries = snapshot($bug_id, $attach_id);
'attach_id' => $target->{'attachment'}->{'id'} ,
'is_active' => 1 });
my @old_summaries;
foreach my $flag (@$flags) {
my $summary = $flag->{'type'}->{'name'} . $flag->{'status'};
$summary .= "(" . $flag->{'requestee'}->login . ")" if $flag->{'requestee'};
push(@old_summaries, $summary);
}
# Cancel old request flags if we are obsoleting an attachment.
if ($attach_id && $data->{'isobsolete'}) {
CancelRequests($bug_id, $attach_id);
}
# Create new flags and update existing flags. # Create new flags and update existing flags.
my $new_flags = FormToNewFlags($target, $data); my $new_flags = FormToNewFlags($target, $data);
foreach my $flag (@$new_flags) { create($flag, $timestamp) } foreach my $flag (@$new_flags) { create($flag, $timestamp) }
...@@ -270,57 +285,62 @@ sub process { ...@@ -270,57 +285,62 @@ sub process {
# In case the bug's product/component has changed, clear flags that are # In case the bug's product/component has changed, clear flags that are
# no longer valid. # no longer valid.
&::SendSQL(" my $flag_ids = $dbh->selectcol_arrayref(
SELECT flags.id "SELECT flags.id
FROM (flags INNER JOIN bugs ON flags.bug_id = bugs.bug_id) FROM (flags INNER JOIN bugs ON flags.bug_id = bugs.bug_id)
LEFT OUTER JOIN flaginclusions i LEFT OUTER JOIN flaginclusions i
ON (flags.type_id = i.type_id ON (flags.type_id = i.type_id
AND (bugs.product_id = i.product_id OR i.product_id IS NULL) AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
AND (bugs.component_id = i.component_id OR i.component_id IS NULL)) AND (bugs.component_id = i.component_id OR i.component_id IS NULL))
WHERE bugs.bug_id = $target->{'bug'}->{'id'} WHERE bugs.bug_id = ?
AND flags.is_active = 1 AND flags.is_active = 1
AND i.type_id IS NULL AND i.type_id IS NULL",
"); undef, $bug_id);
clear(&::FetchOneColumn()) while &::MoreSQLData();
&::SendSQL(" foreach my $flag_id (@$flag_ids) {
SELECT flags.id clear($flag_id);
}
$flag_ids = $dbh->selectcol_arrayref(
"SELECT flags.id
FROM flags, bugs, flagexclusions e FROM flags, bugs, flagexclusions e
WHERE bugs.bug_id = $target->{'bug'}->{'id'} WHERE bugs.bug_id = ?
AND flags.bug_id = bugs.bug_id AND flags.bug_id = bugs.bug_id
AND flags.type_id = e.type_id AND flags.type_id = e.type_id
AND flags.is_active = 1 AND flags.is_active = 1
AND (bugs.product_id = e.product_id OR e.product_id IS NULL) AND (bugs.product_id = e.product_id OR e.product_id IS NULL)
AND (bugs.component_id = e.component_id OR e.component_id IS NULL) AND (bugs.component_id = e.component_id OR e.component_id IS NULL)",
"); undef, $bug_id);
clear(&::FetchOneColumn()) while &::MoreSQLData();
foreach my $flag_id (@$flag_ids) {
# Take a snapshot of flags after changes. clear($flag_id);
$flags = match({ 'bug_id' => $target->{'bug'}->{'id'} ,
'attach_id' => $target->{'attachment'}->{'id'} ,
'is_active' => 1 });
my @new_summaries;
foreach my $flag (@$flags) {
my $summary = $flag->{'type'}->{'name'} . $flag->{'status'};
$summary .= "(" . $flag->{'requestee'}->login . ")" if $flag->{'requestee'};
push(@new_summaries, $summary);
} }
my $old_summaries = join(", ", @old_summaries); # Take a snapshot of flags after changes.
my $new_summaries = join(", ", @new_summaries); my @new_summaries = snapshot($bug_id, $attach_id);
update_activity($bug_id, $attach_id, $timestamp, \@old_summaries, \@new_summaries);
}
sub update_activity {
my ($bug_id, $attach_id, $timestamp, $old_summaries, $new_summaries) = @_;
my $dbh = Bugzilla->dbh;
$attach_id ||= 'NULL';
$old_summaries = join(", ", @$old_summaries);
$new_summaries = join(", ", @$new_summaries);
my ($removed, $added) = diff_strings($old_summaries, $new_summaries); my ($removed, $added) = diff_strings($old_summaries, $new_summaries);
if ($removed ne $added) { if ($removed ne $added) {
my $sql_removed = &::SqlQuote($removed); my $sql_removed = &::SqlQuote($removed);
my $sql_added = &::SqlQuote($added); my $sql_added = &::SqlQuote($added);
my $field_id = &::GetFieldID('flagtypes.name'); my $field_id = &::GetFieldID('flagtypes.name');
my $attach_id = $target->{'attachment'}->{'id'} || 'NULL'; $dbh->do("INSERT INTO bugs_activity
&::SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, " . (bug_id, attach_id, who, bug_when, fieldid, removed, added)
"bug_when, fieldid, removed, added) VALUES " . VALUES ($bug_id, $attach_id, $::userid, $timestamp,
"($target->{'bug'}->{'id'}, $attach_id, $::userid, " . $field_id, $sql_removed, $sql_added)");
"$timestamp, $field_id, $sql_removed, $sql_added)");
} }
} }
sub create { sub create {
# Creates a flag record in the database. # Creates a flag record in the database.
...@@ -642,6 +662,37 @@ sub notify { ...@@ -642,6 +662,37 @@ sub notify {
Bugzilla::BugMail::MessageToMTA($message); Bugzilla::BugMail::MessageToMTA($message);
} }
# Cancel all request flags from the attachment being obsoleted.
sub CancelRequests {
my ($bug_id, $attach_id, $timestamp) = @_;
my $dbh = Bugzilla->dbh;
my $request_ids =
$dbh->selectcol_arrayref("SELECT flags.id
FROM flags
LEFT JOIN attachments ON flags.attach_id = attachments.attach_id
WHERE flags.attach_id = ?
AND flags.status = '?'
AND flags.is_active = 1
AND attachments.isobsolete = 0",
undef, $attach_id);
return if (!scalar(@$request_ids));
# Take a snapshot of flags before any changes.
my @old_summaries = snapshot($bug_id, $attach_id) if ($timestamp);
foreach my $flag (@$request_ids) {
clear($flag);
}
# If $timestamp is undefined, do not update the activity table
return unless ($timestamp);
# Take a snapshot of flags after any changes.
my @new_summaries = snapshot($bug_id, $attach_id);
update_activity($bug_id, $attach_id, $timestamp, \@old_summaries, \@new_summaries);
}
################################################################################ ################################################################################
# Private Functions # Private Functions
################################################################################ ################################################################################
......
attachment.cgi
View file @ 4d718011
...@@ -968,15 +968,13 @@ sub insert ...@@ -968,15 +968,13 @@ sub insert
# Make existing attachments obsolete. # Make existing attachments obsolete.
my $fieldid = GetFieldID('attachments.isobsolete'); my $fieldid = GetFieldID('attachments.isobsolete');
foreach my $obsolete_id (@{$::MFORM{'obsolete'}}) { foreach my $obsolete_id (@{$::MFORM{'obsolete'}}) {
# If the obsolete attachment has request flags, cancel them.
# This call must be done before updating the 'attachments' table.
Bugzilla::Flag::CancelRequests($::FORM{'bugid'}, $obsolete_id, $sql_timestamp);
SendSQL("UPDATE attachments SET isobsolete = 1 WHERE attach_id = $obsolete_id"); SendSQL("UPDATE attachments SET isobsolete = 1 WHERE attach_id = $obsolete_id");
SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added) SendSQL("INSERT INTO bugs_activity (bug_id, attach_id, who, bug_when, fieldid, removed, added)
VALUES ($::FORM{'bugid'}, $obsolete_id, $::userid, $sql_timestamp, $fieldid, '0', '1')"); VALUES ($::FORM{'bugid'}, $obsolete_id, $::userid, $sql_timestamp, $fieldid, '0', '1')");
# If the obsolete attachment has pending flags, migrate them to the new attachment.
if (Bugzilla::Flag::count({ 'attach_id' => $obsolete_id ,
'status' => 'pending',
'is_active' => 1 })) {
Bugzilla::Flag::migrate($obsolete_id, $attachid, $timestamp);
}
} }
# Assign the bug to the user, if they are allowed to take it # Assign the bug to the user, if they are allowed to take it
...@@ -1150,8 +1148,17 @@ sub update ...@@ -1150,8 +1148,17 @@ sub update
my $quotedcontenttype = SqlQuote($::FORM{'contenttype'}); my $quotedcontenttype = SqlQuote($::FORM{'contenttype'});
my $quotedfilename = SqlQuote($::FORM{'filename'}); my $quotedfilename = SqlQuote($::FORM{'filename'});
# Figure out when the changes were made.
SendSQL("SELECT NOW()");
my $timestamp = FetchOneColumn();
# Update flags. These calls must be done before updating the
# 'attachments' table due to the deletion of request flags
# on attachments being obsoleted.
my $target = Bugzilla::Flag::GetTarget(undef, $::FORM{'id'});
Bugzilla::Flag::process($target, $timestamp, \%::FORM);
# Update the attachment record in the database. # Update the attachment record in the database.
# Sets the creation timestamp to itself to avoid it being updated automatically.
SendSQL("UPDATE attachments SendSQL("UPDATE attachments
SET description = $quoteddescription , SET description = $quoteddescription ,
mimetype = $quotedcontenttype , mimetype = $quotedcontenttype ,
...@@ -1162,10 +1169,6 @@ sub update ...@@ -1162,10 +1169,6 @@ sub update
WHERE attach_id = $::FORM{'id'} WHERE attach_id = $::FORM{'id'}
"); ");
# Figure out when the changes were made.
SendSQL("SELECT NOW()");
my $timestamp = FetchOneColumn();
# Record changes in the activity table. # Record changes in the activity table.
my $sql_timestamp = SqlQuote($timestamp); my $sql_timestamp = SqlQuote($timestamp);
if ($olddescription ne $::FORM{'description'}) { if ($olddescription ne $::FORM{'description'}) {
...@@ -1202,10 +1205,6 @@ sub update ...@@ -1202,10 +1205,6 @@ sub update
VALUES ($bugid, $::FORM{'id'}, $::userid, $sql_timestamp, $fieldid, $oldisprivate, $::FORM{'isprivate'})"); VALUES ($bugid, $::FORM{'id'}, $::userid, $sql_timestamp, $fieldid, $oldisprivate, $::FORM{'isprivate'})");
} }
# Update flags.
my $target = Bugzilla::Flag::GetTarget(undef, $::FORM{'id'});
Bugzilla::Flag::process($target, $timestamp, \%::FORM);
# Unlock all database tables now that we are finished updating the database. # Unlock all database tables now that we are finished updating the database.
$dbh->bz_unlock_tables(); $dbh->bz_unlock_tables();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment