Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 410823: Bugzilla fails when editing or deleting a multi-select field value - Patch by Ronaldo Maia <romaia@async.com.br> r/a=LpSolit

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242369 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com
2008-01-04 20:15:57 +00:00
parent 1f123a5869
commit c19735a287
1 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
mozilla/webtools/bugzilla/editvalues.cgi
View File

@@ -165,7 +165,8 @@ unless ($field) {
}
# At this point, the field is defined.
$vars->{'field'} = FieldMustExist($field);
my $field_obj = FieldMustExist($field);
$vars->{'field'} = $field_obj;
trick_taint($field);
#
@@ -271,10 +272,18 @@ if ($action eq 'del') {
trick_taint($value);
# See if any bugs are still using this value.
$vars->{'bug_count'} =
$dbh->selectrow_array("SELECT COUNT(*) FROM bugs WHERE $field = ?",
undef, $value) || 0;
$vars->{'value_count'} =
if ($field_obj->type != FIELD_TYPE_MULTI_SELECT) {
$vars->{'bug_count'} =
$dbh->selectrow_array("SELECT COUNT(*) FROM bugs WHERE $field = ?",
undef, $value);
}
else {
$vars->{'bug_count'} =
$dbh->selectrow_array("SELECT COUNT(*) FROM bug_$field WHERE value = ?",
undef, $value);
}
$vars->{'value_count'} =
$dbh->selectrow_array("SELECT COUNT(*) FROM $field");
$vars->{'value'} = $value;
@@ -319,15 +328,25 @@ if ($action eq 'delete') {
$dbh->bz_start_transaction();
# Check if there are any bugs that still have this value.
my $bug_ids = $dbh->selectcol_arrayref(
"SELECT bug_id FROM bugs WHERE $field = ?", undef, $value);
my $bug_count;
if ($field_obj->type != FIELD_TYPE_MULTI_SELECT) {
$bug_count =
$dbh->selectrow_array("SELECT COUNT(*) FROM bugs WHERE $field = ?",
undef, $value);
}
else {
$bug_count =
$dbh->selectrow_array("SELECT COUNT(*) FROM bug_$field WHERE value = ?",
undef, $value);
}
if (scalar(@$bug_ids)) {
if ($bug_count) {
# You tried to delete a field that bugs are still using.
# You can't just delete the bugs. That's ridiculous.
ThrowUserError("fieldvalue_still_has_bugs",
{ field => $field, value => $value,
count => scalar(@$bug_ids) });
count => $bug_count });
}
if ($field eq 'bug_status') {
@@ -435,8 +454,14 @@ if ($action eq 'update') {
}
trick_taint($value);
$dbh->do("UPDATE bugs SET $field = ? WHERE $field = ?",
undef, $value, $valueold);
if ($field_obj->type != FIELD_TYPE_MULTI_SELECT) {
$dbh->do("UPDATE bugs SET $field = ? WHERE $field = ?",
undef, $value, $valueold);
}
else {
$dbh->do("UPDATE bug_$field SET value = ? WHERE value = ?",
undef, $value, $valueold);
}
$dbh->do("UPDATE $field SET value = ? WHERE value = ?",
undef, $value, $valueold);