summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-10-29 20:52:49 +0100
committerDave Lawrence <dlawrence@mozilla.com>2013-10-29 20:52:49 +0100
commitf3bbb2e7626cef795b740f9a5c4f03e99554771c (patch)
tree32718f8b974dcaba1a9ebff3c4603597083f2c75 /Bugzilla
parent1622591fb61de5f8f2a2b482c9df5816d379892e (diff)
downloadbugzilla-f3bbb2e7626cef795b740f9a5c4f03e99554771c.tar.gz
bugzilla-f3bbb2e7626cef795b740f9a5c4f03e99554771c.tar.xz
Bug 927497 - "Add me to CC list" feature of bug creation screen gives token error
r=LpSolit,a=glob
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/WebService/Bug.pm28
1 files changed, 18 insertions, 10 deletions
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index b24b53dfb..30d07d1f4 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -341,8 +341,7 @@ sub get {
my $ids = $params->{ids};
defined $ids || ThrowCodeError('param_required', { param => 'ids' });
- my @bugs;
- my @faults;
+ my (@bugs, @faults, @hashes);
# 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.
@@ -366,7 +365,8 @@ sub get {
else {
$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
@@ -374,14 +374,9 @@ sub get {
# the data has not changed.
$self->bz_etag(\@bugs);
- if (Bugzilla->user->id) {
- foreach my $bug (@bugs) {
- my $token = issue_hash_token([$bug->{'id'}, $bug->{'last_change_time'}]);
- $bug->{'update_token'} = $self->type('string', $token);
- }
- }
+ $self->_add_update_tokens($params, \@bugs, \@hashes);
- return { bugs => \@bugs, faults => \@faults };
+ return { bugs => \@hashes, faults => \@faults };
}
# 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,
limit => $params->{limit} });
my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes;
+ $self->_add_update_tokens($params, $possible_dupes, \@hashes);
return { bugs => \@hashes };
}
@@ -1219,6 +1215,18 @@ sub _flag_to_hash {
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;
__END__