From: Simon Green Date: Wed, 29 Jul 2015 09:31:14 +0000 (-0400) Subject: Bug 399078 - Remove the 'musthavemilestoneonaccept' parameter X-Git-Tag: release-5.1.1~216 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f578f79698f5779f20ee8354a3af132fafaf66da;p=thirdparty%2Fbugzilla.git Bug 399078 - Remove the 'musthavemilestoneonaccept' parameter r=gerv, a=simon --- diff --git a/Bugzilla/API/1_0/Resource/Bugzilla.pm b/Bugzilla/API/1_0/Resource/Bugzilla.pm index b2e7105f62..de9925e695 100644 --- a/Bugzilla/API/1_0/Resource/Bugzilla.pm +++ b/Bugzilla/API/1_0/Resource/Bugzilla.pm @@ -76,7 +76,6 @@ use constant PARAMETERS_LOGGED_IN => qw( maintainer maxattachmentsize maxlocalattachment - musthavemilestoneonaccept noresolveonopenblockers password_complexity rememberlogin @@ -458,7 +457,6 @@ A logged-in user can access the following parameters (listed alphabetically): C, C, C, - C, C, C, C, diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index ff8f651e4e..2cc9aadb0a 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1529,20 +1529,6 @@ sub _check_bug_status { { old => $old_status ? $old_status->name : undef, 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) { $params->{everconfirmed} = $new_status->name eq 'UNCONFIRMED' ? 0 : 1; diff --git a/Bugzilla/Config/BugChange.pm b/Bugzilla/Config/BugChange.pm index 212f4c171a..6126b7f357 100644 --- a/Bugzilla/Config/BugChange.pm +++ b/Bugzilla/Config/BugChange.pm @@ -53,12 +53,6 @@ sub get_param_list { default => 1 }, - { - name => 'musthavemilestoneonaccept', - type => 'b', - default => 0 - }, - { name => 'commentonchange_resolution', type => 'b', diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm index e1d1b62a1d..a9cef32fc8 100644 --- a/Bugzilla/WebService/Bugzilla.pm +++ b/Bugzilla/WebService/Bugzilla.pm @@ -70,7 +70,6 @@ use constant PARAMETERS_LOGGED_IN => qw( maintainer maxattachmentsize maxlocalattachment - musthavemilestoneonaccept password_complexity rememberlogin requirelogin @@ -427,7 +426,6 @@ A logged-in user can access the following parameters (listed alphabetically): C, C, C, - C, C, C, C, diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst index 5b2eeadc76..f040bcfc67 100644 --- a/docs/en/rst/administering/parameters.rst +++ b/docs/en/rst/administering/parameters.rst @@ -262,9 +262,6 @@ letsubmitterchoosepriority 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. -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* All these fields allow you to dictate what changes can pass without comment and which must have a comment from the diff --git a/docs/en/rst/api/core/v1/bugzilla.rst b/docs/en/rst/api/core/v1/bugzilla.rst index 67029cc1ff..c2458bd0f5 100644 --- a/docs/en/rst/api/core/v1/bugzilla.rst +++ b/docs/en/rst/api/core/v1/bugzilla.rst @@ -186,7 +186,6 @@ Example response for authenticated user: "maintainer" : "admin@example.com", "maxattachmentsize" : "1000", "maxlocalattachment" : "0", - "musthavemilestoneonaccept" : "0", "password_complexity" : "no_constraints", "rememberlogin" : "on", "requirelogin" : "0", @@ -224,7 +223,6 @@ A logged-in user can access the following parameters (listed alphabetically): * maintainer * maxattachmentsize * maxlocalattachment -* musthavemilestoneonaccept * password_complexity * rememberlogin * requirelogin diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl index 89553ad7aa..feaf8769b6 100644 --- a/template/en/default/admin/params/bugchange.html.tmpl +++ b/template/en/default/admin/params/bugchange.html.tmpl @@ -26,11 +26,6 @@ "If off, then all $terms.bugs initially have the default " _ "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 " _ "comment if the resolution of the $terms.bug changes.", diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index d3814f7f32..fe548f927f 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1249,13 +1249,6 @@ The name of a milestone is limited to [% constants.MAX_MILESTONE_SIZE FILTER html %] 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" %] [% title = "Invalid Milestone Sortkey" %] The sortkey '[% sortkey FILTER html %]' is not in the range