Commit f578f796 authored by Simon Green's avatar Simon Green

Bug 399078 - Remove the 'musthavemilestoneonaccept' parameter

r=gerv, a=simon
parent d373bb13
...@@ -76,7 +76,6 @@ use constant PARAMETERS_LOGGED_IN => qw( ...@@ -76,7 +76,6 @@ use constant PARAMETERS_LOGGED_IN => qw(
maintainer maintainer
maxattachmentsize maxattachmentsize
maxlocalattachment maxlocalattachment
musthavemilestoneonaccept
noresolveonopenblockers noresolveonopenblockers
password_complexity password_complexity
rememberlogin rememberlogin
...@@ -458,7 +457,6 @@ A logged-in user can access the following parameters (listed alphabetically): ...@@ -458,7 +457,6 @@ A logged-in user can access the following parameters (listed alphabetically):
C<maintainer>, C<maintainer>,
C<maxattachmentsize>, C<maxattachmentsize>,
C<maxlocalattachment>, C<maxlocalattachment>,
C<musthavemilestoneonaccept>,
C<noresolveonopenblockers>, C<noresolveonopenblockers>,
C<password_complexity>, C<password_complexity>,
C<rememberlogin>, C<rememberlogin>,
......
...@@ -1529,20 +1529,6 @@ sub _check_bug_status { ...@@ -1529,20 +1529,6 @@ sub _check_bug_status {
{ old => $old_status ? $old_status->name : undef, { old => $old_status ? $old_status->name : undef,
new => $new_status->name, field => 'bug_status' }); new => $new_status->name, field => 'bug_status' });
} }
if (ref $invocant
&& ($new_status->name eq 'IN_PROGRESS'
# Backwards-compat for the old default workflow.
or $new_status->name eq 'ASSIGNED')
&& Bugzilla->params->{"usetargetmilestone"}
&& Bugzilla->params->{"musthavemilestoneonaccept"}
# musthavemilestoneonaccept applies only if at least two
# target milestones are defined for the product.
&& scalar(@{ $product->milestones }) > 1
&& $invocant->target_milestone eq $product->default_milestone)
{
ThrowUserError("milestone_required", { bug => $invocant });
}
if (!blessed $invocant) { if (!blessed $invocant) {
$params->{everconfirmed} = $new_status->name eq 'UNCONFIRMED' ? 0 : 1; $params->{everconfirmed} = $new_status->name eq 'UNCONFIRMED' ? 0 : 1;
......
...@@ -54,12 +54,6 @@ sub get_param_list { ...@@ -54,12 +54,6 @@ sub get_param_list {
}, },
{ {
name => 'musthavemilestoneonaccept',
type => 'b',
default => 0
},
{
name => 'commentonchange_resolution', name => 'commentonchange_resolution',
type => 'b', type => 'b',
default => 0 default => 0
......
...@@ -70,7 +70,6 @@ use constant PARAMETERS_LOGGED_IN => qw( ...@@ -70,7 +70,6 @@ use constant PARAMETERS_LOGGED_IN => qw(
maintainer maintainer
maxattachmentsize maxattachmentsize
maxlocalattachment maxlocalattachment
musthavemilestoneonaccept
password_complexity password_complexity
rememberlogin rememberlogin
requirelogin requirelogin
...@@ -427,7 +426,6 @@ A logged-in user can access the following parameters (listed alphabetically): ...@@ -427,7 +426,6 @@ A logged-in user can access the following parameters (listed alphabetically):
C<maintainer>, C<maintainer>,
C<maxattachmentsize>, C<maxattachmentsize>,
C<maxlocalattachment>, C<maxlocalattachment>,
C<musthavemilestoneonaccept>,
C<password_complexity>, C<password_complexity>,
C<rememberlogin>, C<rememberlogin>,
C<requirelogin>, C<requirelogin>,
......
...@@ -262,9 +262,6 @@ letsubmitterchoosepriority ...@@ -262,9 +262,6 @@ letsubmitterchoosepriority
letsubmitterchoosemilestone letsubmitterchoosemilestone
If this is on, then people submitting bugs can choose the Target Milestone for that bug. If off, then all bugs initially have the default milestone for the product being filed in. If this is on, then people submitting bugs can choose the Target Milestone for that bug. If off, then all bugs initially have the default milestone for the product being filed in.
musthavemilestoneonaccept
If you are using Target Milestone, do you want to require that the milestone be set in order for a user to set a bug's status to IN_PROGRESS?
commenton* commenton*
All these fields allow you to dictate what changes can pass All these fields allow you to dictate what changes can pass
without comment and which must have a comment from the without comment and which must have a comment from the
......
...@@ -186,7 +186,6 @@ Example response for authenticated user: ...@@ -186,7 +186,6 @@ Example response for authenticated user:
"maintainer" : "admin@example.com", "maintainer" : "admin@example.com",
"maxattachmentsize" : "1000", "maxattachmentsize" : "1000",
"maxlocalattachment" : "0", "maxlocalattachment" : "0",
"musthavemilestoneonaccept" : "0",
"password_complexity" : "no_constraints", "password_complexity" : "no_constraints",
"rememberlogin" : "on", "rememberlogin" : "on",
"requirelogin" : "0", "requirelogin" : "0",
...@@ -224,7 +223,6 @@ A logged-in user can access the following parameters (listed alphabetically): ...@@ -224,7 +223,6 @@ A logged-in user can access the following parameters (listed alphabetically):
* maintainer * maintainer
* maxattachmentsize * maxattachmentsize
* maxlocalattachment * maxlocalattachment
* musthavemilestoneonaccept
* password_complexity * password_complexity
* rememberlogin * rememberlogin
* requirelogin * requirelogin
......
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
"If off, then all $terms.bugs initially have the default " _ "If off, then all $terms.bugs initially have the default " _
"milestone for the product being filed in.", "milestone for the product being filed in.",
musthavemilestoneonaccept =>
"If you are using ${field_descs.target_milestone}, do you want to require"
_ " that the milestone be set in order for a user to set"
_ " ${terms.abug}'s status to ${accept_status}?",
commentonchange_resolution => "If this option is on, the user needs to enter a short " _ commentonchange_resolution => "If this option is on, the user needs to enter a short " _
"comment if the resolution of the $terms.bug changes.", "comment if the resolution of the $terms.bug changes.",
......
...@@ -1249,13 +1249,6 @@ ...@@ -1249,13 +1249,6 @@
The name of a milestone is limited to [% constants.MAX_MILESTONE_SIZE FILTER html %] The name of a milestone is limited to [% constants.MAX_MILESTONE_SIZE FILTER html %]
characters. '[% name FILTER html %]' is too long ([% name.length %] characters). characters. '[% name FILTER html %]' is too long ([% name.length %] characters).
[% ELSIF error == "milestone_required" %]
[% title = "Milestone Required" %]
You must select a target milestone for [% terms.bug %]
[%+ bug.id FILTER html %]
if you are going to accept it. Part of accepting
[%+ terms.abug %] is giving an estimate of when it will be fixed.
[% ELSIF error == "milestone_sortkey_invalid" %] [% ELSIF error == "milestone_sortkey_invalid" %]
[% title = "Invalid Milestone Sortkey" %] [% title = "Invalid Milestone Sortkey" %]
The sortkey '[% sortkey FILTER html %]' is not in the range The sortkey '[% sortkey FILTER html %]' is not in the range
......
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