diff options
4 files changed, 32 insertions, 33 deletions
diff --git a/extensions/MozProjectReview/Extension.pm b/extensions/MozProjectReview/Extension.pm index 821a3619e..02621ff7d 100644 --- a/extensions/MozProjectReview/Extension.pm +++ b/extensions/MozProjectReview/Extension.pm @@ -56,34 +56,31 @@ sub post_bug_after_creation { if ($params->{new_or_change} eq 'New') { $do_legal = 1; - $do_privacy_policy = 1; - } - elsif ($params->{new_or_change} eq 'Existing') { - $do_legal = 1; } - if ($params->{separate_party} eq 'Yes' - && $params->{relationship_type} ne 'Hardware Purchase') - { - $do_legal = 1; - } + if ($params->{separate_party} eq 'Yes') { + if ($params->{relationship_type} ne 'Hardware Purchase') { + $do_legal = 1; + } - if ($params->{data_access} eq 'Yes') { - $do_privacy_policy = 1; - $do_sec_review = 1; - } + if ($params->{data_access} eq 'Yes') { + $do_privacy_policy = 1; + $do_legal = 1; + $do_sec_review = 1; + } - if ($params->{data_access} eq 'Yes' - && $params->{'privacy_policy_vendor_user_data'} eq 'Yes') - { - $do_privacy_vendor = 1; - } + if ($params->{data_access} eq 'Yes' + && $params->{'privacy_policy_vendor_user_data'} eq 'Yes') + { + $do_privacy_vendor = 1; + } - if ($params->{vendor_cost} eq '> $25,000' - || ($params->{vendor_cost} eq '<= $25,000' - && $params->{po_needed} eq 'Yes')) - { - $do_finance = 1; + if ($params->{vendor_cost} eq '> $25,000' + || ($params->{vendor_cost} eq '<= $25,000' + && $params->{po_needed} eq 'Yes')) + { + $do_finance = 1; + } } my ($sec_review_bug, $legal_bug, $finance_bug, $privacy_vendor_bug, diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl index a6a8b303f..802caeee9 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl @@ -15,8 +15,8 @@ Legal Questions: Priority: [% cgi.param('legal_priority') %] Other Party: [% cgi.param('legal_other_party') %] -Business Objective: [% cgi.param('legal_business_objective') %] -URL: [% cgi.param('legal_url') %] +What help do you need from Legal?: +[%+ cgi.param('legal_help_from_legal') %] [% IF cgi.param('legal_vendor_services_where') %] Vendor Services from Where: [% IF cgi.param('legal_vendor_services_where') == 'A single country' %] @@ -25,8 +25,6 @@ Vendor Services from Where: [%- cgi.param('legal_vendor_services_where') %] [% END %] [% END %] -Description: -[%+ cgi.param('legal_description') %] [% IF cgi.param('separate_party') == 'Yes' && cgi.param('relationship_type') == 'Vendor/Services' %] SOW Details: Legal Vendor Name: [% cgi.param('legal_sow_vendor_name') %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl index a1015c168..251f26c6d 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl @@ -260,8 +260,9 @@ onchange="MPR.toggleVisibleById(this, 'Vendor/Services', 'legal_sow_questions'); MPR.toggleVisibleById(this, 'Vendor/Services', 'legal_vendor_services_where_row'); MPR.toggleVisibleById(this, 'Hardware Purchase', 'finance_questions'); - if (this.value == 'Hardware Purchase') Dom.addClass('legal_questions', 'bz_default_hidden'); - else if (Dom.get('separate_party').value == 'Yes' || Dom.get('mozilla_data').value == 'Yes') + if (this.value == 'Hardware Purchase' && Dom.get('mozilla_data').value != 'Yes') + Dom.addClass('legal_questions', 'bz_default_hidden'); + else if (Dom.get('separate_party').value == 'Yes') Dom.removeClass('legal_questions', 'bz_default_hidden');"> <option value="">Select One</option> <option value="Vendor/Services">Vendor/Services</option> @@ -513,10 +514,12 @@ </span> </div> - <div id="legal_business_objective_row" class="field_row"> - <span class="field_label">Business Objective:</span> + <div id="legal_help_from_legal_row" class="field_row"> + <span class="field_label required">What help do you<br>need from Legal?</span> <span class="field_data"> - <textarea name="legal_business_objective" id="legal_business_objective" rows="10" cols="80"></textarea> + <div class="field_description"> + Please explain specifically what help you need from Legal. If none, put "No Legal help needed."</div> + <textarea name="legal_help_from_legal" id="legal_help_from_legal" rows="10" cols="80"></textarea> </span> </div> diff --git a/extensions/MozProjectReview/web/js/moz_project_review.js b/extensions/MozProjectReview/web/js/moz_project_review.js index d7873ad35..4c5a5314e 100644 --- a/extensions/MozProjectReview/web/js/moz_project_review.js +++ b/extensions/MozProjectReview/web/js/moz_project_review.js @@ -34,7 +34,8 @@ MPR.required_fields = { "finance_purchase_cost": "Please enter a value for total cost in the finance questions section" }, "legal_questions": { - "legal_priority": "Please select a priority for the legal questions section" + "legal_priority": "Please select a priority for the legal questions section", + "legal_help_from_legal": "Please describe the help needed from the Legal department", }, "legal_sow_questions": { "legal_sow_vendor_name": "Please enter a value for SOW legal vendor name", |