diff options
| -rw-r--r-- | Bugzilla/Flag.pm | 63 | ||||
| -rwxr-xr-x | attachment.cgi | 4 | ||||
| -rwxr-xr-x | process_bug.cgi | 2 |
3 files changed, 47 insertions, 22 deletions
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm index 02ddb65ba..2b70cf2ca 100644 --- a/Bugzilla/Flag.pm +++ b/Bugzilla/Flag.pm @@ -590,7 +590,7 @@ sub modify { # Use the date/time we were given if possible (allowing calling code # to synchronize the comment's timestamp with those of other records). - $timestamp = ($timestamp ? &::SqlQuote($timestamp) : "NOW()"); + my $sql_timestamp = ($timestamp ? &::SqlQuote($timestamp) : "NOW()"); # Extract a list of flags from the form data. my @ids = map(/^flag-(\d+)$/ ? $1 : (), $cgi->param()); @@ -604,9 +604,35 @@ sub modify { my $flag = get($id); my $status = $cgi->param("flag-$id"); - my $requestee_email = trim($cgi->param("requestee-$id") || ''); + # If the user entered more than one name into the requestee field + # (i.e. they want more than one person to set the flag) we can reuse + # the existing flag for the first person (who may well be the existing + # requestee), but we have to create new flags for each additional. + my @requestees = $cgi->param("requestee-$id"); + my $requestee_email; + if ($status eq "?" + && scalar(@requestees) > 1 + && $flag->{type}->{is_multiplicable}) + { + # The first person, for which we'll reuse the existing flag. + $requestee_email = shift(@requestees); + + # Create new flags like the existing one for each additional person. + foreach my $login (@requestees) { + create({ type => $flag->{type} , + target => $flag->{target} , + setter => new Bugzilla::User($::userid), + status => "?", + requestee => new Bugzilla::User(login_to_id($login)) }, + $timestamp); + } + } + else { + $requestee_email = trim($cgi->param("requestee-$id") || ''); + } + # Ignore flags the user didn't change. There are two components here: # either the status changes (trivial) or the requestee changes. # Change of either field will cause full update of the flag. @@ -639,7 +665,7 @@ sub modify { SET setter_id = $::userid , requestee_id = NULL , status = '$status' , - modification_date = $timestamp , + modification_date = $sql_timestamp , is_active = 1 WHERE id = $flag->{'id'}"); @@ -664,7 +690,7 @@ sub modify { SET setter_id = $::userid , requestee_id = $requestee_id , status = '$status' , - modification_date = $timestamp , + modification_date = $sql_timestamp , is_active = 1 WHERE id = $flag->{'id'}"); @@ -776,25 +802,24 @@ sub FormToNewFlags { my $status = $cgi->param("flag_type-$type_id"); trick_taint($status); - - # Create the flag record and populate it with data from the form. - my $flag = { - type => $flag_type , - target => $target , - setter => $setter , - status => $status - }; if ($status eq "?") { - my $requestee = $cgi->param("requestee_type-$type_id"); - if ($requestee) { - my $requestee_id = login_to_id($requestee); - $flag->{'requestee'} = new Bugzilla::User($requestee_id); + foreach my $login ($cgi->param("requestee_type-$type_id")) { + my $requestee = new Bugzilla::User(login_to_id($login)); + push (@flags, { type => $flag_type , + target => $target , + setter => $setter , + status => $status , + requestee => $requestee }); + last if !$flag_type->{'is_multiplicable'}; } } - - # Add the flag to the array of flags. - push(@flags, $flag); + else { + push (@flags, { type => $flag_type , + target => $target , + setter => $setter , + status => $status }); + } } # Return the list of flags. diff --git a/attachment.cgi b/attachment.cgi index fba504690..eec1e0a2e 100755 --- a/attachment.cgi +++ b/attachment.cgi @@ -916,7 +916,7 @@ sub insert # and FlagType::validate assume User::match_field has ensured that the # values in the requestee fields are legitimate user email addresses. my $match_status = Bugzilla::User::match_field($cgi, { - '^requestee(_type)?-(\d+)$' => { 'type' => 'single' }, + '^requestee(_type)?-(\d+)$' => { 'type' => 'multi' }, }, MATCH_SKIP_CONFIRM); $vars->{'match_field'} = 'requestee'; @@ -1162,7 +1162,7 @@ sub update # and FlagType::validate assume User::match_field has ensured that the # values in the requestee fields are legitimate user email addresses. Bugzilla::User::match_field($cgi, { - '^requestee(_type)?-(\d+)$' => { 'type' => 'single' } + '^requestee(_type)?-(\d+)$' => { 'type' => 'multi' } }); Bugzilla::Flag::validate($cgi, $bugid, $attach_id); Bugzilla::FlagType::validate($cgi, $bugid, $attach_id); diff --git a/process_bug.cgi b/process_bug.cgi index 543c9bf0e..157a73a2c 100755 --- a/process_bug.cgi +++ b/process_bug.cgi @@ -164,7 +164,7 @@ foreach my $field ("dependson", "blocked") { 'newcc' => { 'type' => 'multi' }, 'masscc' => { 'type' => 'multi' }, 'assigned_to' => { 'type' => 'single' }, - '^requestee(_type)?-(\d+)$' => { 'type' => 'single' }, + '^requestee(_type)?-(\d+)$' => { 'type' => 'multi' }, }); # Validate flags in all cases. validate() should not detect any |