diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-09-30 23:50:01 +0200 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-09-30 23:50:01 +0200 |
| commit | 77f1cffd26e4e306b46558142a432acdbb67b9f1 (patch) | |
| tree | e79f3e29d233c0afbc8c7928b408b8a6119847dc /extensions | |
| parent | f6e81df17967ab414235bcc12d3432df69192f1a (diff) | |
| parent | f517974618ba835014e9d2a3565109af469f5d34 (diff) | |
| download | bugzilla-77f1cffd26e4e306b46558142a432acdbb67b9f1.tar.gz bugzilla-77f1cffd26e4e306b46558142a432acdbb67b9f1.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Voting/Extension.pm | 23 | ||||
| -rw-r--r-- | extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl | 14 |
2 files changed, 26 insertions, 11 deletions
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm index 8a786e659..6a90176ec 100644 --- a/extensions/Voting/Extension.pm +++ b/extensions/Voting/Extension.pm @@ -52,6 +52,21 @@ use constant REL_VOTER => 4; # Installation # ################ +BEGIN { + *Bugzilla::Bug::votes = \&votes; +} + +sub votes { + my $self = shift; + my $dbh = Bugzilla->dbh; + + return $self->{votes} if exists $self->{votes}; + + $self->{votes} = $dbh->selectrow_array('SELECT votes FROM bugs WHERE bug_id = ?', + undef, $self->id); + return $self->{votes}; +} + sub db_schema_abstract_schema { my ($self, $args) = @_; $args->{'schema'}->{'votes'} = { @@ -663,7 +678,7 @@ sub _modify_bug_votes { } } - $changes->{'too_many_votes'} = \@toomanyvotes_list; + $changes->{'_too_many_votes'} = \@toomanyvotes_list; # 2. too many total votes for a single user. # This part doesn't work in the general case because _remove_votes @@ -710,7 +725,7 @@ sub _modify_bug_votes { } } - $changes->{'too_many_total_votes'} = \@toomanytotalvotes_list; + $changes->{'_too_many_total_votes'} = \@toomanytotalvotes_list; # 3. enough votes to confirm my $bug_list = $dbh->selectcol_arrayref( @@ -723,7 +738,7 @@ sub _modify_bug_votes { my $confirmed = _confirm_if_vote_confirmed($bug_id); push (@updated_bugs, $bug_id) if $confirmed; } - $changes->{'confirmed_bugs'} = \@updated_bugs; + $changes->{'_confirmed_bugs'} = \@updated_bugs; # Now that changes are done, we can send emails to voters. foreach my $msg (@msgs) { @@ -733,7 +748,7 @@ sub _modify_bug_votes { foreach my $bug_id (@updated_bugs) { my $sent_bugmail = Bugzilla::BugMail::Send( $bug_id, { changer => Bugzilla->user }); - $changes->{'confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail; + $changes->{'_confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail; } } diff --git a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl index af2b1c102..15fb1efe0 100644 --- a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl +++ b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl @@ -56,8 +56,8 @@ <p>Checking existing votes in this product for anybody who now has too many votes for [% terms.abug %]...<br> - [% IF changes.too_many_votes.size %] - [% FOREACH detail = changes.too_many_votes %] + [% IF changes._too_many_votes.size %] + [% FOREACH detail = changes._too_many_votes %] →removed votes for [% terms.bug %] <a href="show_bug.cgi?id= [%- detail.id FILTER uri %]"> [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br> @@ -69,8 +69,8 @@ <p>Checking existing votes in this product for anybody who now has too many total votes...<br> - [% IF changes.too_many_total_votes.size %] - [% FOREACH detail = changes.too_many_total_votes %] + [% IF changes._too_many_total_votes.size %] + [% FOREACH detail = changes._too_many_total_votes %] →removed votes for [% terms.bug %] <a href="show_bug.cgi?id= [%- detail.id FILTER uri %]"> [%- detail.id FILTER html %]</a> from [% detail.name FILTER html %]<br> @@ -82,15 +82,15 @@ <p>Checking unconfirmed [% terms.bugs %] in this product for any which now have sufficient votes...<br> - [% IF changes.confirmed_bugs.size %] - [% FOREACH id = changes.confirmed_bugs %] + [% IF changes._confirmed_bugs.size %] + [% FOREACH id = changes._confirmed_bugs %] [%# This is INCLUDED instead of PROCESSED to avoid variables getting overwritten, which happens otherwise %] [% INCLUDE bug/process/results.html.tmpl type = 'votes' header_done = 1 - sent_bugmail = changes.confirmed_bugs_sent_bugmail.$id + sent_bugmail = changes._confirmed_bugs_sent_bugmail.$id id = id %] [% END %] |