Skip to content

bugzilla
bugzilla
Commit 1a2ac2c8 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 396497: Use should_set everywhere in process_bug

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
parent 5309f887
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 48 deletions
process_bug.cgi
View file @ 1a2ac2c8
...@@ -98,11 +98,16 @@ sub send_results { ...@@ -98,11 +98,16 @@ sub send_results {
# Tells us whether or not a field should be changed by process_bug, by # Tells us whether or not a field should be changed by process_bug, by
# checking that it's defined and not set to dontchange. # checking that it's defined and not set to dontchange.
sub should_set { sub should_set {
my ($field) = @_; # check_defined is used for custom fields, where there's another field
# whose name starts with "defined_" and then the field name--it's used
# to know when we did things like empty a multi-select or deselect
# a checkbox.
my ($field, $check_defined) = @_;
my $cgi = Bugzilla->cgi; my $cgi = Bugzilla->cgi;
if (defined $cgi->param($field) if (( defined $cgi->param($field)
&& (!$cgi->param('dontchange') || ($check_defined && defined $cgi->param("defined_$field")) )
|| $cgi->param($field) ne $cgi->param('dontchange'))) && ( !$cgi->param('dontchange')
|| $cgi->param($field) ne $cgi->param('dontchange')) )
{ {
return 1; return 1;
} }
...@@ -317,12 +322,7 @@ foreach my $b (@bug_objects) { ...@@ -317,12 +322,7 @@ foreach my $b (@bug_objects) {
bug_file_loc status_whiteboard short_desc bug_file_loc status_whiteboard short_desc
deadline remaining_time estimated_time)) deadline remaining_time estimated_time))
{ {
# We only update the field if it's defined and it's not set if (should_set($field_name)) {
# to dontchange.
if ( defined $cgi->param($field_name)
&& (!$cgi->param('dontchange')
|| $cgi->param($field_name) ne $cgi->param('dontchange')) )
{
my $method = $methods{$field_name}; my $method = $methods{$field_name};
$method ||= "set_" . $field_name; $method ||= "set_" . $field_name;
$b->$method($cgi->param($field_name)); $b->$method($cgi->param($field_name));
...@@ -421,10 +421,7 @@ sub DoComma { ...@@ -421,10 +421,7 @@ sub DoComma {
# Add custom fields data to the query that will update the database. # Add custom fields data to the query that will update the database.
foreach my $field (Bugzilla->get_fields({custom => 1, obsolete => 0})) { foreach my $field (Bugzilla->get_fields({custom => 1, obsolete => 0})) {
my $fname = $field->name; my $fname = $field->name;
if ( (defined $cgi->param($fname) || defined $cgi->param("defined_$fname")) if (should_set($fname, 1)) {
&& (!$cgi->param('dontchange')
|| $cgi->param($fname) ne $cgi->param('dontchange')))
{
$_->set_custom_field($field, [$cgi->param($fname)]) foreach @bug_objects; $_->set_custom_field($field, [$cgi->param($fname)]) foreach @bug_objects;
} }
} }
...@@ -546,10 +543,7 @@ my $assignee_checked = 0; ...@@ -546,10 +543,7 @@ my $assignee_checked = 0;
my %usercache = (); my %usercache = ();
if (defined $cgi->param('assigned_to') if (should_set('assigned_to') && !$cgi->param('set_default_assignee')) {
&& !$cgi->param('set_default_assignee')
&& trim($cgi->param('assigned_to')) ne $cgi->param('dontchange'))
{
my $name = trim($cgi->param('assigned_to')); my $name = trim($cgi->param('assigned_to'));
if ($name ne "") { if ($name ne "") {
$assignee = login_to_id($name, THROW_ERROR); $assignee = login_to_id($name, THROW_ERROR);
...@@ -577,38 +571,35 @@ if (defined $cgi->param('assigned_to') ...@@ -577,38 +571,35 @@ if (defined $cgi->param('assigned_to')
$assignee_checked = 1; $assignee_checked = 1;
}; };
if (defined $cgi->param('qa_contact') && !$cgi->param('set_default_qa_contact')) { if (should_set('qa_contact') && !$cgi->param('set_default_qa_contact')) {
my $name = trim($cgi->param('qa_contact')); my $name = trim($cgi->param('qa_contact'));
# The QA contact cannot be deleted from show_bug.cgi for a single bug! $qacontact = login_to_id($name, THROW_ERROR) if ($name ne "");
if ($name ne $cgi->param('dontchange')) { if ($qacontact && Bugzilla->params->{"strict_isolation"}
$qacontact = login_to_id($name, THROW_ERROR) if ($name ne ""); && !(defined $cgi->param('id') && $bug->qa_contact
if ($qacontact && Bugzilla->params->{"strict_isolation"} && $qacontact == $bug->qa_contact->id))
&& !(defined $cgi->param('id') && $bug->qa_contact {
&& $qacontact == $bug->qa_contact->id)) $usercache{$qacontact} ||= Bugzilla::User->new($qacontact);
{ my $qa_user = $usercache{$qacontact};
$usercache{$qacontact} ||= Bugzilla::User->new($qacontact); foreach my $product_id (@newprod_ids) {
my $qa_user = $usercache{$qacontact}; if (!$qa_user->can_edit_product($product_id)) {
foreach my $product_id (@newprod_ids) { my $product_name = Bugzilla::Product->new($product_id)->name;
if (!$qa_user->can_edit_product($product_id)) { ThrowUserError('invalid_user_group',
my $product_name = Bugzilla::Product->new($product_id)->name; {'users' => $qa_user->login,
ThrowUserError('invalid_user_group', 'product' => $product_name,
{'users' => $qa_user->login, 'bug_id' => (scalar(@idlist) > 1)
'product' => $product_name, ? undef : $idlist[0]
'bug_id' => (scalar(@idlist) > 1) });
? undef : $idlist[0]
});
}
} }
} }
$qacontact_checked = 1; }
DoComma(); $qacontact_checked = 1;
if($qacontact) { DoComma();
$::query .= "qa_contact = ?"; if($qacontact) {
push(@values, $qacontact); $::query .= "qa_contact = ?";
} push(@values, $qacontact);
else { }
$::query .= "qa_contact = NULL"; else {
} $::query .= "qa_contact = NULL";
} }
} }
......
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