Commit cf6262d5 authored by bugreport%peshkin.net's avatar bugreport%peshkin.net

Bug 95430 Reopening en masse fails.

Patch by jeff.hedlund r=justdave, joel
parent 4fc0668c
...@@ -898,12 +898,8 @@ SWITCH: for ($::FORM{'knob'}) { ...@@ -898,12 +898,8 @@ SWITCH: for ($::FORM{'knob'}) {
last SWITCH; last SWITCH;
}; };
/^reopen$/ && CheckonComment( "reopen" ) && do { /^reopen$/ && CheckonComment( "reopen" ) && do {
SendSQL("SELECT resolution FROM bugs WHERE bug_id = $::FORM{'id'}");
ChangeStatus('REOPENED'); ChangeStatus('REOPENED');
ChangeResolution(''); ChangeResolution('');
if (FetchOneColumn() eq 'DUPLICATE') {
SendSQL("DELETE FROM duplicates WHERE dupe = $::FORM{'id'}");
}
last SWITCH; last SWITCH;
}; };
/^verify$/ && CheckonComment( "verify" ) && do { /^verify$/ && CheckonComment( "verify" ) && do {
...@@ -1058,7 +1054,7 @@ foreach my $id (@idlist) { ...@@ -1058,7 +1054,7 @@ foreach my $id (@idlist) {
"profiles $write, dependencies $write, votes $write, " . "profiles $write, dependencies $write, votes $write, " .
"products READ, components READ, " . "products READ, components READ, " .
"keywords $write, longdescs $write, fielddefs $write, " . "keywords $write, longdescs $write, fielddefs $write, " .
"bug_group_map $write, flags $write, " . "bug_group_map $write, flags $write, duplicates $write," .
"user_group_map READ, flagtypes READ, " . "user_group_map READ, flagtypes READ, " .
"flaginclusions AS i READ, flagexclusions AS e READ, " . "flaginclusions AS i READ, flagexclusions AS e READ, " .
"keyworddefs READ, groups READ, attachments READ"); "keyworddefs READ, groups READ, attachments READ");
...@@ -1243,6 +1239,13 @@ foreach my $id (@idlist) { ...@@ -1243,6 +1239,13 @@ foreach my $id (@idlist) {
if ($::comma ne "") { if ($::comma ne "") {
SendSQL($query); SendSQL($query);
} }
# Check for duplicates if the bug is [re]open
SendSQL("SELECT resolution FROM bugs WHERE bug_id = $id");
my $resolution = FetchOneColumn();
if ($resolution eq '') {
SendSQL("DELETE FROM duplicates WHERE dupe = $id");
}
my @groupAddNames = (); my @groupAddNames = ();
foreach my $grouptoadd (@groupAdd) { foreach my $grouptoadd (@groupAdd) {
if (!BugInGroupId($id, $grouptoadd)) { if (!BugInGroupId($id, $grouptoadd)) {
......
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