Skip to content

bugzilla
bugzilla
Commit a73890d2 authored by mkanat%bugzilla.org's avatar mkanat%bugzilla.org
Browse files
Options

Bug 162060: Remove the relationship between "votestoconfirm" and whether or not…

Bug 162060: Remove the relationship between "votestoconfirm" and whether or not the UNCONFIRMED status is available, by adding a checkbox to enable the UNCONFIRMED status in editproducts.cgi. Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=LpSolit
parent 3eb0b0d6
Hide whitespace changes
Inline Side-by-side
Showing with 130 additions and 59 deletions
Bugzilla/Bug.pm
View file @ a73890d2
...@@ -1122,9 +1122,7 @@ sub _check_bug_status { ...@@ -1122,9 +1122,7 @@ sub _check_bug_status {
} }
else { else {
@valid_statuses = @{Bugzilla::Status->can_change_to()}; @valid_statuses = @{Bugzilla::Status->can_change_to()};
if (!$product->votes_to_confirm) { if (!$product->allows_unconfirmed) {
# UNCONFIRMED becomes an invalid status if votes_to_confirm is 0,
# even if you are in editbugs.
@valid_statuses = grep {$_->name ne 'UNCONFIRMED'} @valid_statuses; @valid_statuses = grep {$_->name ne 'UNCONFIRMED'} @valid_statuses;
} }
} }
...@@ -1157,9 +1155,13 @@ sub _check_bug_status { ...@@ -1157,9 +1155,13 @@ sub _check_bug_status {
} }
} }
} }
# Time to validate the bug status. # Time to validate the bug status.
$new_status = Bugzilla::Status->check($new_status) unless ref($new_status); $new_status = Bugzilla::Status->check($new_status) unless ref($new_status);
if (!grep {$_->name eq $new_status->name} @valid_statuses) { # We skip this check if we are changing from a status to itself.
if ( (!$old_status || $old_status->id != $new_status->id)
&& !grep {$_->name eq $new_status->name} @valid_statuses)
{
ThrowUserError('illegal_bug_status_transition', ThrowUserError('illegal_bug_status_transition',
{ old => $old_status, new => $new_status }); { old => $old_status, new => $new_status });
} }
...@@ -2804,7 +2806,7 @@ sub statuses_available { ...@@ -2804,7 +2806,7 @@ sub statuses_available {
my @statuses = @{ $self->status->can_change_to }; my @statuses = @{ $self->status->can_change_to };
# UNCONFIRMED is only a valid status if it is enabled in this product. # UNCONFIRMED is only a valid status if it is enabled in this product.
if (!$self->product_obj->votes_to_confirm) { if (!$self->product_obj->allows_unconfirmed) {
@statuses = grep { $_->name ne 'UNCONFIRMED' } @statuses; @statuses = grep { $_->name ne 'UNCONFIRMED' } @statuses;
} }
...@@ -2816,6 +2818,11 @@ sub statuses_available { ...@@ -2816,6 +2818,11 @@ sub statuses_available {
push(@available, $status); push(@available, $status);
} }
# If this bug has an inactive status set, it should still be in the list.
if (!grep($_->name eq $self->status->name, @available)) {
unshift(@available, $self->status);
}
$self->{'statuses_available'} = \@available; $self->{'statuses_available'} = \@available;
return $self->{'statuses_available'}; return $self->{'statuses_available'};
} }
...@@ -3367,7 +3374,10 @@ sub CheckIfVotedConfirmed { ...@@ -3367,7 +3374,10 @@ sub CheckIfVotedConfirmed {
my $bug = new Bugzilla::Bug($id); my $bug = new Bugzilla::Bug($id);
my $ret = 0; my $ret = 0;
if (!$bug->everconfirmed && $bug->votes >= $bug->product_obj->votes_to_confirm) { if (!$bug->everconfirmed
and $bug->product_obj->votes_to_confirm
and $bug->votes >= $bug->product_obj->votes_to_confirm)
{
$bug->add_comment('', { type => CMT_POPULAR_VOTES }); $bug->add_comment('', { type => CMT_POPULAR_VOTES });
if ($bug->bug_status eq 'UNCONFIRMED') { if ($bug->bug_status eq 'UNCONFIRMED') {
......
Bugzilla/DB/Schema.pm
View file @ a73890d2
...@@ -1224,6 +1224,8 @@ use constant ABSTRACT_SCHEMA => { ...@@ -1224,6 +1224,8 @@ use constant ABSTRACT_SCHEMA => {
DEFAULT => 0}, DEFAULT => 0},
defaultmilestone => {TYPE => 'varchar(20)', defaultmilestone => {TYPE => 'varchar(20)',
NOTNULL => 1, DEFAULT => "'---'"}, NOTNULL => 1, DEFAULT => "'---'"},
allows_unconfirmed => {TYPE => 'BOOLEAN', NOTNULL => 1,
DEFAULT => 'FALSE'},
], ],
INDEXES => [ INDEXES => [
products_name_idx => {FIELDS => ['name'], products_name_idx => {FIELDS => ['name'],
......
Bugzilla/Install/DB.pm
View file @ a73890d2
...@@ -592,6 +592,8 @@ sub update_table_definitions { ...@@ -592,6 +592,8 @@ sub update_table_definitions {
$dbh->bz_drop_column('products', 'milestoneurl'); $dbh->bz_drop_column('products', 'milestoneurl');
_add_allows_unconfirmed_to_product_table();
################################################################ ################################################################
# New --TABLE-- changes should go *** A B O V E *** this point # # New --TABLE-- changes should go *** A B O V E *** this point #
################################################################ ################################################################
...@@ -3328,6 +3330,16 @@ sub _set_attachment_comment_types { ...@@ -3328,6 +3330,16 @@ sub _set_attachment_comment_types {
_populate_bugs_fulltext($bug_ids); _populate_bugs_fulltext($bug_ids);
} }
sub _add_allows_unconfirmed_to_product_table {
my $dbh = Bugzilla->dbh;
if (!$dbh->bz_column_info('products', 'allows_unconfirmed')) {
$dbh->bz_add_column('products', 'allows_unconfirmed',
{ TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE' });
$dbh->do('UPDATE products SET allows_unconfirmed = 1
WHERE votestoconfirm > 0');
}
}
1; 1;
__END__ __END__
......
Bugzilla/Product.pm
View file @ a73890d2
...@@ -58,6 +58,7 @@ use constant DB_COLUMNS => qw( ...@@ -58,6 +58,7 @@ use constant DB_COLUMNS => qw(
maxvotesperbug maxvotesperbug
votestoconfirm votestoconfirm
defaultmilestone defaultmilestone
allows_unconfirmed
); );
use constant REQUIRED_CREATE_FIELDS => qw( use constant REQUIRED_CREATE_FIELDS => qw(
...@@ -74,9 +75,11 @@ use constant UPDATE_COLUMNS => qw( ...@@ -74,9 +75,11 @@ use constant UPDATE_COLUMNS => qw(
votesperuser votesperuser
maxvotesperbug maxvotesperbug
votestoconfirm votestoconfirm
allows_unconfirmed
); );
use constant VALIDATORS => { use constant VALIDATORS => {
allows_unconfirmed => \&Bugzilla::Object::check_boolean,
classification => \&_check_classification, classification => \&_check_classification,
name => \&_check_name, name => \&_check_name,
description => \&_check_description, description => \&_check_description,
...@@ -631,6 +634,7 @@ sub set_is_active { $_[0]->set('isactive', $_[1]); } ...@@ -631,6 +634,7 @@ sub set_is_active { $_[0]->set('isactive', $_[1]); }
sub set_votes_per_user { $_[0]->set('votesperuser', $_[1]); } sub set_votes_per_user { $_[0]->set('votesperuser', $_[1]); }
sub set_votes_per_bug { $_[0]->set('maxvotesperbug', $_[1]); } sub set_votes_per_bug { $_[0]->set('maxvotesperbug', $_[1]); }
sub set_votes_to_confirm { $_[0]->set('votestoconfirm', $_[1]); } sub set_votes_to_confirm { $_[0]->set('votestoconfirm', $_[1]); }
sub set_allows_unconfirmed { $_[0]->set('allows_unconfirmed', $_[1]); }
sub set_group_controls { sub set_group_controls {
my ($self, $group, $settings) = @_; my ($self, $group, $settings) = @_;
...@@ -882,6 +886,7 @@ sub flag_types { ...@@ -882,6 +886,7 @@ sub flag_types {
#### Accessors ###### #### Accessors ######
############################### ###############################
sub allows_unconfirmed { return $_[0]->{'allows_unconfirmed'}; }
sub description { return $_[0]->{'description'}; } sub description { return $_[0]->{'description'}; }
sub is_active { return $_[0]->{'isactive'}; } sub is_active { return $_[0]->{'isactive'}; }
sub votes_per_user { return $_[0]->{'votesperuser'}; } sub votes_per_user { return $_[0]->{'votesperuser'}; }
...@@ -941,6 +946,7 @@ Bugzilla::Product - Bugzilla product class. ...@@ -941,6 +946,7 @@ Bugzilla::Product - Bugzilla product class.
my votestoconfirm = $product->votes_to_confirm; my votestoconfirm = $product->votes_to_confirm;
my $defaultmilestone = $product->default_milestone; my $defaultmilestone = $product->default_milestone;
my $classificationid = $product->classification_id; my $classificationid = $product->classification_id;
my $allows_unconfirmed = $product->allows_unconfirmed;
=head1 DESCRIPTION =head1 DESCRIPTION
......
attachment.cgi
View file @ a73890d2
...@@ -496,7 +496,8 @@ sub insert { ...@@ -496,7 +496,8 @@ sub insert {
($bug_status) = grep {$_->name eq $bug_status} @{$bug->status->can_change_to}; ($bug_status) = grep {$_->name eq $bug_status} @{$bug->status->can_change_to};
if ($bug_status && $bug_status->is_open if ($bug_status && $bug_status->is_open
&& ($bug_status->name ne 'UNCONFIRMED' || $bug->product_obj->votes_to_confirm)) && ($bug_status->name ne 'UNCONFIRMED'
|| $bug->product_obj->allows_unconfirmed))
{ {
$bug->set_status($bug_status->name); $bug->set_status($bug_status->name);
$bug->clear_resolution(); $bug->clear_resolution();
......
editproducts.cgi
View file @ a73890d2
...@@ -176,17 +176,22 @@ if ($action eq 'new') { ...@@ -176,17 +176,22 @@ if ($action eq 'new') {
check_token_data($token, 'add_product'); check_token_data($token, 'add_product');
my $product = my %create_params = (
Bugzilla::Product->create({classification => $classification_name, classification => $classification_name,
name => $product_name, name => $product_name,
description => scalar $cgi->param('description'), description => scalar $cgi->param('description'),
version => scalar $cgi->param('version'), version => scalar $cgi->param('version'),
defaultmilestone => scalar $cgi->param('defaultmilestone'), defaultmilestone => scalar $cgi->param('defaultmilestone'),
isactive => scalar $cgi->param('is_active'), isactive => scalar $cgi->param('is_active'),
votesperuser => scalar $cgi->param('votesperuser'), create_series => scalar $cgi->param('createseries'),
maxvotesperbug => scalar $cgi->param('maxvotesperbug'), allows_unconfirmed => scalar $cgi->param('allows_unconfirmed'),
votestoconfirm => scalar $cgi->param('votestoconfirm'), );
create_series => scalar $cgi->param('createseries')}); if (Bugzilla->params->{'usevotes'}) {
$create_params{votesperuser} = $cgi->param('votesperuser');
$create_params{maxvotesperbug} = $cgi->param('maxvotesperbug');
$create_params{votestoconfirm} = $cgi->param('votestoconfirm');
}
my $product = Bugzilla::Product->create(\%create_params);
delete_token($token); delete_token($token);
...@@ -294,9 +299,12 @@ if ($action eq 'update') { ...@@ -294,9 +299,12 @@ if ($action eq 'update') {
$product->set_description(scalar $cgi->param('description')); $product->set_description(scalar $cgi->param('description'));
$product->set_default_milestone(scalar $cgi->param('defaultmilestone')); $product->set_default_milestone(scalar $cgi->param('defaultmilestone'));
$product->set_is_active(scalar $cgi->param('is_active')); $product->set_is_active(scalar $cgi->param('is_active'));
$product->set_votes_per_user(scalar $cgi->param('votesperuser')); if (Bugzilla->params->{'usevotes'}) {
$product->set_votes_per_bug(scalar $cgi->param('maxvotesperbug')); $product->set_votes_per_user(scalar $cgi->param('votesperuser'));
$product->set_votes_to_confirm(scalar $cgi->param('votestoconfirm')); $product->set_votes_per_bug(scalar $cgi->param('maxvotesperbug'));
$product->set_votes_to_confirm(scalar $cgi->param('votestoconfirm'));
}
$product->set_allows_unconfirmed(scalar $cgi->param('allows_unconfirmed'));
my $changes = $product->update(); my $changes = $product->update();
......
enter_bug.cgi
View file @ a73890d2
...@@ -520,8 +520,10 @@ my $initial_statuses = Bugzilla::Status->can_change_to(); ...@@ -520,8 +520,10 @@ my $initial_statuses = Bugzilla::Status->can_change_to();
@$initial_statuses = grep { $_->is_open } @$initial_statuses; @$initial_statuses = grep { $_->is_open } @$initial_statuses;
my @status = map { $_->name } @$initial_statuses; my @status = map { $_->name } @$initial_statuses;
# UNCONFIRMED is illegal if votes_to_confirm = 0. # UNCONFIRMED is illegal if allows_unconfirmed is false.
@status = grep {$_ ne 'UNCONFIRMED'} @status unless $product->votes_to_confirm; if (!$product->allows_unconfirmed) {
@status = grep {$_ ne 'UNCONFIRMED'} @status;
}
scalar(@status) || ThrowUserError('no_initial_bug_status'); scalar(@status) || ThrowUserError('no_initial_bug_status');
# If the user has no privs... # If the user has no privs...
......
importxml.pl
View file @ a73890d2
...@@ -913,7 +913,7 @@ sub process_bug { ...@@ -913,7 +913,7 @@ sub process_bug {
# Check everconfirmed # Check everconfirmed
my $everconfirmed; my $everconfirmed;
if ($product->votes_to_confirm) { if ($product->allows_unconfirmed) {
$everconfirmed = $bug_fields{'everconfirmed'} || 0; $everconfirmed = $bug_fields{'everconfirmed'} || 0;
} }
else { else {
......
sanitycheck.cgi
View file @ a73890d2
...@@ -976,7 +976,8 @@ BugCheck("bugs WHERE bug_status IN ($confirmed_open_states) AND everconfirmed = ...@@ -976,7 +976,8 @@ BugCheck("bugs WHERE bug_status IN ($confirmed_open_states) AND everconfirmed =
Status('bug_check_votes_everconfirmed'); Status('bug_check_votes_everconfirmed');
BugCheck("bugs INNER JOIN products ON bugs.product_id = products.id " . BugCheck("bugs INNER JOIN products ON bugs.product_id = products.id " .
"WHERE everconfirmed = 0 AND votestoconfirm <= votes", "WHERE everconfirmed = 0 AND votestoconfirm > 0
AND votestoconfirm <= votes",
'bug_check_votes_everconfirmed_error_text'); 'bug_check_votes_everconfirmed_error_text');
########################################################################### ###########################################################################
......
template/en/default/admin/products/create.html.tmpl
View file @ a73890d2
...@@ -25,15 +25,17 @@ ...@@ -25,15 +25,17 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = title title = title
style_urls = ['skins/standard/admin.css'] style_urls = ['skins/standard/admin.css']
javascript_urls = ['js/util.js']
%] %]
[% DEFAULT [% DEFAULT
product.votesperuser = "0", product.votesperuser = "0",
product.maxvotesperbug = "10000", product.maxvotesperbug = "10000",
product.votestoconfirm = "0", product.votes_to_confirm = "0",
product.is_active = 1, product.is_active = 1,
version = "unspecified", version = "unspecified",
product.defaultmilestone = constants.DEFAULT_MILESTONE product.defaultmilestone = constants.DEFAULT_MILESTONE
product.allows_unconfirmed = 0
%] %]
<form method="post" action="editproducts.cgi"> <form method="post" action="editproducts.cgi">
......
template/en/default/admin/products/edit-common.html.tmpl
View file @ a73890d2
...@@ -69,39 +69,44 @@ ...@@ -69,39 +69,44 @@
[% ' checked="checked"' IF product.is_active %]> [% ' checked="checked"' IF product.is_active %]>
</td> </td>
</tr> </tr>
<tr>
[% IF !Param('usevotes') %]
<tr class="param_disabled">
<td colspan="2"
style="font-family: arial; font-style: italic; font-size: 0.7em; text-align: center;">
The 'usevotes' parameter is currently 'off'. These voting
settings will take effect when the parameter is next enabled.</td>
</tr>
[% END %]
<tr [% IF !Param('usevotes') %]class="param_disabled" [% END %]>
<th align="right">Maximum votes per person:</th>
<td><input size="5" maxlength="5" name="votesperuser"
value="[% product.votesperuser FILTER html %]">
</td>
</tr>
<tr [% IF !Param('usevotes') %]class="param_disabled" [% END %]>
<th align="right">
Maximum votes a person can put on a single [% terms.bug %]:
</th>
<td><input size="5" maxlength="5" name="maxvotesperbug"
value="[% product.maxvotesperbug FILTER html %]">
</td>
</tr>
<tr [% IF !Param('usevotes') %]class="param_disabled" [% END %]>
<th align="right"> <th align="right">
Confirmation threshold: <label for="allows_unconfirmed">Enable the
[%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status
in this product:</label>
</th> </th>
<td> <td><input type="checkbox" id="allows_unconfirmed" name="allows_unconfirmed"
Enter the number of votes [% terms.abug %] in this product needs to [% ' checked="checked"' IF product.allows_unconfirmed %]
automatically get out of the [% IF Param('usevotes') %]
<a href="page.cgi?id=fields.html#status">[% display_value("bug_status", "UNCONFIRMED") FILTER html %]</a> onchange="bz_toggleClass('votes_to_confirm_container',
state.<br> 'bz_default_hidden')"
<input size="5" maxlength="5" name="votestoconfirm" [% END %]>
value="[% product.votestoconfirm FILTER html %]"> [% IF Param('usevotes') %]
<span id="votes_to_confirm_container"
[% ' class="bz_default_hidden"' IF !product.allows_unconfirmed %]>
...and automatically confirm [% terms.bugs %] if they get
<input size="3" maxlength="5" name="votestoconfirm" id="votestoconfirm"
value="[% product.votes_to_confirm FILTER html %]">
votes. (Setting this to 0 disables auto-confirming [% terms.bugs %]
by vote.)
</span>
[% END %]
</td> </td>
</tr> </tr>
[% IF Param('usevotes') %]
<tr>
<th align="right">Maximum votes per person:</th>
<td><input size="5" maxlength="5" name="votesperuser" id="votesperuser"
value="[% product.votesperuser FILTER html %]">
</td>
</tr>
<tr>
<th align="right">
Maximum votes a person can put on a single [% terms.bug %]:
</th>
<td><input size="5" maxlength="5" name="maxvotesperbug" id="maxvotesperbug"
value="[% product.maxvotesperbug FILTER html %]">
</td>
</tr>
[% END %]
template/en/default/admin/products/edit.html.tmpl
View file @ a73890d2
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
title = title title = title
style_urls = ['skins/standard/admin.css'] style_urls = ['skins/standard/admin.css']
javascript_urls = ['js/util.js']
%] %]
[% group_control = {${constants.CONTROLMAPNA} => 'NA', [% group_control = {${constants.CONTROLMAPNA} => 'NA',
......
template/en/default/admin/products/updated.html.tmpl
View file @ a73890d2
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
style_urls = ['skins/standard/admin.css'] style_urls = ['skins/standard/admin.css']
%] %]
[% PROCESS "global/field-descs.none.tmpl" %]
[% IF changes.name.defined %] [% IF changes.name.defined %]
<p> <p>
Updated product name from '[% changes.name.0 FILTER html %]' to Updated product name from '[% changes.name.0 FILTER html %]' to
...@@ -101,6 +103,24 @@ ...@@ -101,6 +103,24 @@
[% checkvotes = 1 %] [% checkvotes = 1 %]
[% END %] [% END %]
[% IF changes.allows_unconfirmed.defined %]
<p>
[% IF product.allows_unconfirmed %]
The product now allows the
[%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status.
[% ELSE %]
The product no longer allows the
[%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status.
Note that any
<a href="buglist.cgi?product=
[%- product.name FILTER url_quote %]&amp;bug_status=UNCONFIRMED">
[%- terms.bugs %] that currently have the
[%+ display_value('bug_status', 'UNCONFIRMED') FILTER html %] status</a>
will remain in that status until they are edited.
[% END %]
</p>
[% END %]
[% IF !changes.keys.size %] [% IF !changes.keys.size %]
<p>Nothing changed for product '[% product.name FILTER html %]'.</p> <p>Nothing changed for product '[% product.name FILTER html %]'.</p>
[% END %] [% END %]
......
template/en/default/attachment/create.html.tmpl
View file @ a73890d2
...@@ -77,7 +77,8 @@ ...@@ -77,7 +77,8 @@
<label for="takebug">take [% terms.bug %]</label> <label for="takebug">take [% terms.bug %]</label>
[% bug_statuses = [] %] [% bug_statuses = [] %]
[% FOREACH bug_status = bug.status.can_change_to %] [% FOREACH bug_status = bug.status.can_change_to %]
[% NEXT IF bug_status.name == "UNCONFIRMED" && !bug.product_obj.votes_to_confirm %] [% NEXT IF bug_status.name == "UNCONFIRMED"
&& !bug.product_obj.allows_unconfirmed %]
[% bug_statuses.push(bug_status) IF bug_status.is_open %] [% bug_statuses.push(bug_status) IF bug_status.is_open %]
[% END %] [% END %]
[% IF bug_statuses.size %] [% IF bug_statuses.size %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment