diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2014-09-16 23:38:36 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2014-09-20 02:43:36 +0200 |
| commit | c516e35a1e444387512e9a49afb4b20b76d36375 (patch) | |
| tree | dc737491507804c12fb827b256a8243d6257ca43 /extensions/Review | |
| parent | fb7ed7baca8c4321549f8142ffab4d6c9eefd391 (diff) | |
| download | bugzilla-c516e35a1e444387512e9a49afb4b20b76d36375.tar.gz bugzilla-c516e35a1e444387512e9a49afb4b20b76d36375.tar.xz | |
Bug 1067410 - Modification time wrong for deleted flags in review schema
Diffstat (limited to 'extensions/Review')
| -rw-r--r-- | extensions/Review/Extension.pm | 32 | ||||
| -rw-r--r-- | extensions/Review/lib/WebService.pm | 2 |
2 files changed, 19 insertions, 15 deletions
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm index d5d96daa9..f6a3bf743 100644 --- a/extensions/Review/Extension.pm +++ b/extensions/Review/Extension.pm @@ -320,7 +320,7 @@ sub object_end_of_create { _adjust_request_count($object, +1); } if (_is_countable_flag($object)) { - $self->_log_flag_state_activity($object, $object->status); + $self->_log_flag_state_activity($object, $object->status, $object->modification_date); } } @@ -393,25 +393,27 @@ sub object_end_of_update { sub flag_updated { my ($self, $args) = @_; - my $flag = $args->{flag}; - my $changes = $args->{changes}; + my $flag = $args->{flag}; + my $timestamp = $args->{timestamp}; + my $changes = $args->{changes}; return unless scalar(keys %$changes); if (_is_countable_flag($flag)) { - $self->_log_flag_state_activity( $flag, $flag->status ); + $self->_log_flag_state_activity($flag, $flag->status, $timestamp); } } -sub object_before_delete { +sub flag_deleted { my ($self, $args) = @_; - my $object = $args->{object}; + my $flag = $args->{flag}; + my $timestamp = $args->{timestamp}; - if (_is_countable_flag($object) && $object->requestee_id && $object->status eq '?') { - _adjust_request_count($object, -1); + if (_is_countable_flag($flag) && $flag->requestee_id && $flag->status eq '?') { + _adjust_request_count($flag, -1); } - if (_is_countable_flag($object)) { - $self->_log_flag_state_activity($object, 'X'); + if (_is_countable_flag($flag)) { + $self->_log_flag_state_activity($flag, 'X', $timestamp, Bugzilla->user->id); } } @@ -423,17 +425,19 @@ sub _is_countable_flag { } sub _log_flag_state_activity { - my ($self, $flag, $status) = @_; + my ($self, $flag, $status, $timestamp, $setter_id) = @_; + + $setter_id //= $flag->setter_id; Bugzilla::Extension::Review::FlagStateActivity->create({ - flag_when => $flag->modification_date, + flag_when => $timestamp, + setter_id => $setter_id, + status => $status, type_id => $flag->type_id, flag_id => $flag->id, - setter_id => $flag->setter_id, requestee_id => $flag->requestee_id, bug_id => $flag->bug_id, attachment_id => $flag->attach_id, - status => $status, }); } diff --git a/extensions/Review/lib/WebService.pm b/extensions/Review/lib/WebService.pm index b3baf509a..c61c358df 100644 --- a/extensions/Review/lib/WebService.pm +++ b/extensions/Review/lib/WebService.pm @@ -366,7 +366,7 @@ GET /rest/review/flag_activity/setter/C<setter> GET /rest/review/flag_activity/type_id/C<type_id> -GET /rest/review/flag_activity/type/C<type_name> +GET /rest/review/flag_activity/type_name/C<type_name> GET /rest/review/flag_activity |