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

Bug 927497 - "Add me to CC list" feature of bug creation screen gives token error

Browse Source 
r=LpSolit,a=glob


git-svn-id: svn://10.0.0.236/trunk@265088 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2013-10-29 20:01:16 +00:00
parent 4ea314fdab
commit b0d5998309
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8792 8793

28
mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm
View File

@ -341,8 +341,7 @@ sub get {
my $ids = $params->{ids}; my $ids = $params->{ids};
defined $ids || ThrowCodeError('param_required', { param => 'ids' }); defined $ids || ThrowCodeError('param_required', { param => 'ids' });
my @bugs; my (@bugs, @faults, @hashes);
my @faults;
# Cache permissions for bugs. This highly reduces the number of calls to the DB. # Cache permissions for bugs. This highly reduces the number of calls to the DB.
# visible_bugs() is only able to handle bug IDs, so we have to skip aliases. # visible_bugs() is only able to handle bug IDs, so we have to skip aliases.
@ -366,7 +365,8 @@ sub get {
else { else {
$bug = Bugzilla::Bug->check($bug_id); $bug = Bugzilla::Bug->check($bug_id);
} }
push(@bugs, $self->_bug_to_hash($bug, $params)); push(@bugs, $bug);
push(@hashes, $self->_bug_to_hash($bug, $params));
} }
# Set the ETag before inserting the update tokens # Set the ETag before inserting the update tokens
@ -374,14 +374,9 @@ sub get {
# the data has not changed. # the data has not changed.
$self->bz_etag(\@bugs); $self->bz_etag(\@bugs);
if (Bugzilla->user->id) { $self->_add_update_tokens($params, \@bugs, \@hashes);
foreach my $bug (@bugs) {
my $token = issue_hash_token([$bug->{'id'}, $bug->{'last_change_time'}]);
$bug->{'update_token'} = $self->type('string', $token);
}
}
return { bugs => \@bugs, faults => \@faults }; return { bugs => \@hashes, faults => \@faults };
} }
# this is a function that gets bug activity for list of bug ids # this is a function that gets bug activity for list of bug ids
@ -566,6 +561,7 @@ sub possible_duplicates {
{ summary => $params->{summary}, products => \@products, { summary => $params->{summary}, products => \@products,
limit => $params->{limit} }); limit => $params->{limit} });
my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes; my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes;
$self->_add_update_tokens($params, $possible_dupes, \@hashes);
return { bugs => \@hashes }; return { bugs => \@hashes };
} }
@ -1219,6 +1215,18 @@ sub _flag_to_hash {
return $item; return $item;
} }
sub _add_update_tokens {
my ($self, $params, $bugs, $hashes) = @_;
return if !Bugzilla->user->id;
return if !filter_wants($params, 'update_token');
for(my $i = 0; $i < @$bugs; $i++) {
my $token = issue_hash_token([$bugs->[$i]->id, $bugs->[$i]->delta_ts]);
$hashes->[$i]->{'update_token'} = $self->type('string', $token);
}
}
1; 1;
__END__ __END__