From aad9a94d7da97d68f4d4289ae93d2665dedfd98e Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Wed, 23 Nov 2016 14:25:36 +0000 Subject: Bug 1264821 - We want to replace the project kick-off form with a contract request form --- extensions/MozProjectReview/Extension.pm | 155 +--- ...ent-moz-project-review-data-compliance.txt.tmpl | 28 - .../comment-moz-project-review-finance.txt.tmpl | 18 +- .../comment-moz-project-review-legal.txt.tmpl | 51 -- ...ment-moz-project-review-privacy-policy.txt.tmpl | 17 - ...omment-moz-project-review-privacy-tech.txt.tmpl | 12 - ...ment-moz-project-review-privacy-vendor.txt.tmpl | 16 - .../comment-moz-project-review-sec-review.txt.tmpl | 10 +- .../bug/create/comment-moz-project-review.txt.tmpl | 137 +++- .../bug/create/create-moz-project-review.html.tmpl | 780 +++++++++------------ .../bug/create/initial-questions-comment.txt.tmpl | 42 ++ .../MozProjectReview/web/js/moz_project_review.js | 424 ++++++----- .../web/style/moz_project_review.css | 4 +- 13 files changed, 771 insertions(+), 923 deletions(-) delete mode 100644 extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl delete mode 100644 extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl delete mode 100644 extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl delete mode 100644 extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-tech.txt.tmpl delete mode 100644 extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-vendor.txt.tmpl create mode 100644 extensions/MozProjectReview/template/en/default/bug/create/initial-questions-comment.txt.tmpl (limited to 'extensions/MozProjectReview') diff --git a/extensions/MozProjectReview/Extension.pm b/extensions/MozProjectReview/Extension.pm index fcad6916c..f85822d4d 100644 --- a/extensions/MozProjectReview/Extension.pm +++ b/extensions/MozProjectReview/Extension.pm @@ -12,23 +12,14 @@ use warnings; use base qw(Bugzilla::Extension); +our $VERSION = '0.01'; + use Bugzilla::User; use Bugzilla::Group; use Bugzilla::Error; use Bugzilla::Constants; -our $VERSION = '0.01'; - -# these users will be cc'd to the parent bug when the corresponding child bug -# is created, as well as the child bug. -our %auto_cc = ( - 'legal' => ['liz@mozilla.com'], - 'finance' => ['waoieong@mozilla.com', 'mcristobal@mozilla.com', 'echoe@mozilla.com'], - 'privacy-vendor' => ['smartin@mozilla.com'], - 'privacy-project' => ['ahua@mozilla.com'], - 'privacy-tech' => ['ahua@mozilla.com'], - 'policy-business-partner' => ['smartin@mozilla.com'] -); +use List::MoreUtils qw(any); sub post_bug_after_creation { my ($self, $args) = @_; @@ -39,50 +30,28 @@ sub post_bug_after_creation { my $params = Bugzilla->input_params; my $template = Bugzilla->template; - return if !($params->{format} - && $params->{format} eq 'moz-project-review' - && $bug->component eq 'Project Review'); + return if !($params->{format} && $params->{format} eq 'moz-project-review'); # do a match if applicable Bugzilla::User::match_field({ - 'legal_cc' => { 'type' => 'multi' } + 'sow_vendor_mozcontact' => { 'type' => 'single' }, }); - my ($do_sec_review, $do_legal, $do_finance, $do_data_compliance); - - if ($params->{'mozilla_data'} eq 'Yes') { - $do_legal = 1; - $do_data_compliance = 1; + my $do_sec_review = 0; + my @sec_review_needed = ( + 'Engaging a new vendor company', + 'Engaging an individual (independent contractor, temp agency worker, incorporated)', + 'Adding a new SOW with a vendor', + 'Extending an SOW or renewing a contract', + 'Purchasing software', + 'Signing up for an online service', + ); + if ((any { $_ eq $params->{contract_type} } @sec_review_needed) + || $params->{mozilla_data} eq 'Yes') { $do_sec_review = 1; } - if ($params->{'separate_party'} eq 'Yes') { - if ($params->{'relationship_type'} ne 'Hardware Purchase') { - $do_legal = 1; - } - - if ($params->{'data_access'} eq 'Yes') { - $do_data_compliance = 1; - $do_legal = 1; - $do_sec_review = 1; - } - - if ($params->{'data_access'} eq 'Yes' - && $params->{'privacy_policy_vendor_user_data'} eq 'Yes') - { - $do_data_compliance = 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, $data_compliance_bug, - $error, @dep_comment, @dep_errors, @send_mail); + my ($sec_review_bug, $finance_bug, $error, @dep_comment, @dep_errors, @send_mail); # Common parameters always passed to _file_child_bug # bug_data and template_suffix will be different for each bug @@ -105,79 +74,27 @@ sub post_bug_after_creation { rep_platform => 'All', version => 'unspecified', blocked => $bug->bug_id, + cc => $params->{cc}, }; $child_params->{'template_suffix'} = 'sec-review'; _file_child_bug($child_params); } - if ($do_legal) { - my $component = 'General'; - - if ($params->{separate_party} eq 'Yes' - && $params->{relationship_type}) - { - $component = ($params->{relationship_type} eq 'Other' - || $params->{relationship_type} eq 'Hardware Purchase') - ? 'General' - : $params->{relationship_type}; - } - - my $legal_summary = "Legal Review: "; - $legal_summary .= $params->{legal_other_party} . " - " if $params->{legal_other_party}; - $legal_summary .= $bug->short_desc; - - $child_params->{'bug_data'} = { - short_desc => $legal_summary, - product => 'Legal', - component => $component, - bug_severity => 'normal', - priority => '--', - groups => [ 'legal' ], - op_sys => 'All', - rep_platform => 'All', - version => 'unspecified', - blocked => $bug->bug_id, - cc => $params->{'legal_cc'}, - }; - $child_params->{'template_suffix'} = 'legal'; - _file_child_bug($child_params); - } - - if ($do_finance) { - $child_params->{'bug_data'} = { - short_desc => 'Finance Review: ' . $bug->short_desc, - product => 'Finance', - component => 'Purchase Request Form', - bug_severity => 'normal', - priority => '--', - groups => [ 'finance' ], - op_sys => 'All', - rep_platform => 'All', - version => 'unspecified', - blocked => $bug->bug_id, - }; - $child_params->{'template_suffix'} = 'finance'; - _file_child_bug($child_params); - } - - if ($do_data_compliance) { - $child_params->{'bug_data'} = { - short_desc => 'Data Compliance Review: ' . $bug->short_desc, - product => 'Data Compliance', - component => 'General', - bug_severity => 'normal', - priority => '--', - bug_severity => $params->{data_comp_urgency}, - groups => [ 'mozilla-employee-confidential' ], - op_sys => 'All', - rep_platform => 'All', - version => 'unspecified', - cf_due_date => $params->{release_date}, - blocked => $bug->bug_id, - }; - $child_params->{'template_suffix'} = 'data-compliance'; - _file_child_bug($child_params); - } + $child_params->{'bug_data'} = { + short_desc => 'Finance Review: ' . $bug->short_desc, + product => 'Finance', + component => 'Purchase Request Form', + bug_severity => 'normal', + priority => '--', + groups => [ 'finance' ], + op_sys => 'All', + rep_platform => 'All', + version => 'unspecified', + blocked => $bug->bug_id, + cc => $params->{cc}, + }; + $child_params->{'template_suffix'} = 'finance'; + _file_child_bug($child_params); if (scalar @dep_errors) { warn "[Bug " . $bug->id . "] Failed to create additional moz-project-review bugs:\n" . @@ -214,16 +131,10 @@ sub _file_child_bug { Bugzilla->template->process($full_template, $template_vars, \$comment) || ThrowTemplateError(Bugzilla->template->error()); $bug_data->{'comment'} = $comment; - if (exists $auto_cc{$template_suffix}) { - $bug_data->{'cc'} = $auto_cc{$template_suffix}; - } if ($new_bug = Bugzilla::Bug->create($bug_data)) { my $set_all = { dependson => { add => [ $new_bug->bug_id ] } }; - if (exists $auto_cc{$template_suffix}) { - $set_all->{'cc'} = { add => $auto_cc{$template_suffix} }; - } $parent_bug->set_all($set_all); $parent_bug->update($parent_bug->creation_ts); } diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl deleted file mode 100644 index 889543c0c..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-data-compliance.txt.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -> Request Type -[%+ cgi.param('data_comp_request_type') %] - -> Area -[%+ cgi.param('data_comp_area') %] - -> Description -[%+ cgi.param('data_comp_desc') %] - -> Does this request involve a change in data collection or handling? -[%+ cgi.param('data_comp_handling_change') %] - -> Does this request involve a change in to the business unit's data practices? -[%+ cgi.param('data_comp_practice_change') %] - -> Other Information -[%+ cgi.param('data_comp_other') || "None" %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl index eaa626a7e..f28658078 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl @@ -9,22 +9,28 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] +[% PROCESS "bug/create/initial-questions-comment.txt.tmpl" %] -Finance Questions: +[% RETURN IF cgi.param('vendor_cost') != '< $25,000 PO Needed' && cgi.param('vendor_cost') != '> $25,000' %] +>> Finance Question -Vendor: [% cgi.param('finance_purchase_vendor') %] Is this line item in budget?: [%+ cgi.param('finance_purchase_inbudget') %] + What is the purchase for?: [%+ cgi.param('finance_purchase_what') %] + Why is the purchase needed?: [%+ cgi.param('finance_purchase_why') %] + What is the risk if not purchased?: [%+ cgi.param('finance_purchase_risk') %] -What is the alternative?: + +What is the alternative?: [%+ cgi.param('finance_purchase_alternative') %] -What is the urgency?: [% cgi.param('finance_purchase_urgency') %] + What is the shipping address?: [%+ cgi.param('finance_shipment_address') %] -Total Cost: [% cgi.param('finance_purchase_cost') %] + +Total not to exceed amount: +[%+ cgi.param('sow_vendor_total_max') %] 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 deleted file mode 100644 index 9856736d1..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-legal.txt.tmpl +++ /dev/null @@ -1,51 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] - -Legal Questions: - -Priority: [% cgi.param('legal_priority') %] -Time Frame For Completion of Legal Portion?: [% cgi.param('legal_timeframe') %] -Other Party: [% cgi.param('legal_other_party') %] -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' %] -[%- cgi.param('legal_vendor_single_country') %] -[% ELSE %] -[%- cgi.param('legal_vendor_services_where') %] -[% END %] -[% END %] -[% IF cgi.param('separate_party') == 'Yes' && cgi.param('relationship_type') == 'Vendor/Services' %] -SOW Details: -Legal Vendor Name: [% cgi.param('legal_sow_vendor_name') %] -Vendor Address: -[%+ cgi.param('legal_sow_vendor_address') %] -Vendor Email for Notices: [% cgi.param('legal_sow_vendor_email') %] -Mozilla Contact: [% cgi.param('legal_sow_vendor_mozcontact') %] -Vendor Contact and Email Address: [% cgi.param('legal_sow_vendor_contact') %] -Description of Services: -[%+ cgi.param('legal_sow_vendor_services') %] -Description of Deliverables: -[%+ cgi.param('legal_sow_vendor_deliverables') %] -Start Date: [% cgi.param('legal_sow_start_date') %] -End Date: [% cgi.param('legal_sow_end_date') %] -Rate of Pay: [% cgi.param('legal_sow_vendor_payment') %] -Basis for Payment: [% cgi.param('legal_sow_vendor_payment_basis') %] -Average/Maximum Hours: [% cgi.param('legal_sow_vendor_hours') %] -Payment Schedule: [% cgi.param('legal_sow_vendor_payment_schedule') %] -Total Not to Exceed Amount: [% cgi.param('legal_sow_vendor_total_max') %] -Special Terms: -[%+ cgi.param('legal_sow_vendor_special_terms') %] -Product Line: [% cgi.param('legal_sow_vendor_product_line') %] -[% END %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl deleted file mode 100644 index ff3f5adb6..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-policy.txt.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] - -Is there a privacy policy for this new feature/product?: -[%+ cgi.param('privacy_policy_project_link') %] -What assistance do you need from the privacy team (if any)?: -[%+ cgi.param('privacy_policy_project_assistance') %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-tech.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-tech.txt.tmpl deleted file mode 100644 index 7b72cf1bc..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-tech.txt.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-vendor.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-vendor.txt.tmpl deleted file mode 100644 index eaf9f12e3..000000000 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-privacy-vendor.txt.tmpl +++ /dev/null @@ -1,16 +0,0 @@ -[%# This Source Code Form is subject to the terms of the Mozilla Public - # License, v. 2.0. If a copy of the MPL was not distributed with this - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # This Source Code Form is "Incompatible With Secondary Licenses", as - # defined by the Mozilla Public License, v. 2.0. - #%] - -[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] - -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] - -Privacy Policy: [% cgi.param('privacy_policy_vendor_user_data') %] -Vendor's Privacy Policy: [% cgi.param('privacy_policy_vendor_link') %] -Privacy Questionnaire: [% cgi.param('privacy_policy_vendor_questionnaire') %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-sec-review.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-sec-review.txt.tmpl index 029f6df48..cb3317cfa 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-sec-review.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-sec-review.txt.tmpl @@ -9,12 +9,12 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] -[% PROCESS "bug/create/comment-moz-project-review.txt.tmpl" %] +[% PROCESS "bug/create/initial-questions-comment.txt.tmpl" %] -Security Review Questions: +>> Vendor Security Review Questions + +Review Invitees: +[%+ cgi.param('sec_review_invitees') %] -Affects Products: [% cgi.param('sec_affects_products') %] -Review Due Date: [% cgi.param('sec_review_date') %] -Review Invitees: [% cgi.param('sec_review_invitees') %] Extra Information: [%+ cgi.param('sec_review_extra') %] diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl index 07d5fa5ad..e0c42df7e 100644 --- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl +++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl @@ -9,25 +9,120 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] -Initial Questions: - -Project/Feature Name: [% cgi.param('short_desc') %] -Tracking [% terms.Bug %] ID:[% cgi.param('tracking_id') %] -Description: -[%+ cgi.param('description') %] -Additional Information: -[%+ cgi.param('additional') %] -Key Initiative: [% cgi.param('key_initiative') == 'Other' - ? cgi.param('key_initiative_other') - : cgi.param('key_initiative') %] -Release Date: [% cgi.param('release_date') %] -Project Status: [% cgi.param('project_status') %] -Mozilla Data: [% cgi.param('mozilla_data') %] -Mozilla Related: [% cgi.param('mozilla_related') %] -Separate Party: [% cgi.param('separate_party') %] -[% IF cgi.param('separate_party') == 'Yes' %] -Type of Relationship: [% cgi.param('relationship_type') %] -Data Access: [% cgi.param('data_access') %] -Privacy Policy: [% cgi.param('privacy_policy') %] -Vendor Cost: [% cgi.param('vendor_cost') %] +[% PROCESS "bug/create/initial-questions-comment.txt.tmpl" %] + +[% IF cgi.param('contract_type') == 'Engaging an individual (independent contractor, temp agency worker, incorporated)' %] +>> Independent Contractor Questions + +Is this someone we've worked with before? +[%+ cgi.param('independent_contractor_prev_work') %] + +[% IF cgi.param('independent_contractor_prev_work') == 'Yes' %] +If yes, enter the [% terms.bug %] number for the previous work or note that this is a former employee: +[%+ terms.Bug +%] [%+ cgi.param('independent_contractor_prev_work_bug') %] +[% END %] + +Has this person incorporated (sole proprietorship or similar form)? +[%+ cgi.param('independent_contractor_incorporated') %] + +Will the person be engaged through a staffing agency? +[%+ cgi.param('independent_contractor_staff_agency') %] + +Does the person have other clients? +[%+ cgi.param('independent_contractor_other_clients') %] + +Does the person provide services similar to a paid Mozilla employee? +[%+ cgi.param('independent_contractor_dupe_services') %] + +[% IF cgi.param('independent_contractor_dupe_services') == 'Yes' %] +If yes, is the person primarily being engaged due to a temporary increase in workload or as backfill for an employee on leave? +[%+ cgi.param('independent_contractor_dupe_services_temp') %] +[% END %] + +Will the person be managing his or her own time? +[%+ cgi.param('independent_contractor_self_manage') %] + +Will the person be using his or her own equipment? +[%+ cgi.param('independent_contractor_own_equipment') %] + +Will the person be regularly working at a Mozilla facility? +[%+ cgi.param('independent_contractor_mozilla_facility') %] + +Will the person be supervising Mozilla employees? +[%+ cgi.param('independent_contractor_supervising') %] +[% END %] + +>> Contract Specific Questions + +Vendor/Contractor/Partner Name: +[%+ cgi.param('other_party') %] + +[% IF cgi.param('contract_type') == 'Engaging a new vendor company' + || cgi.param('contract_type') == 'Engaging an individual (independent contractor, temp agency worker, incorporated)' + || cgi.param('contract_type') == 'Adding a new SOW with a vendor' %] +>> SOW Details + +Vendor Address: +[%+ cgi.param('sow_vendor_address') %] + +Vendor Email for Legal Notices: +[%+ cgi.param('sow_vendor_email') %] + +Mozilla Contact: +[%+ cgi.param('sow_vendor_mozcontact') %] + +Vendor Contact and Email Address: +[%+ cgi.param('sow_vendor_contact') %] + +Vendor Services to be Provided: +[%+ cgi.param('sow_vendor_services') %] + +Access to Mozilla Systems Required: +[%+ cgi.param('sow_vendor_mozilla_systems') %] + +[% IF cgi.param('sow_vendow_mozilla_systems') == 'Yes' %] +Mozilla Systems Access Explanation: +[%+ cgi.param('sow_vendor_mozilla_systems_explain') %] +[% END %] + +Vendor Onsite at Mozilla Location: +[%+ cgi.param('sow_vendor_onsite') %] + +[% IF cgi.param('sow_vendor_onsite') == 'Yes' %] +Where and When Vendor will be Onsite: +[%+ cgi.param('sow_vendor_onsite_where') %] +[% END %] + +Description of Deliverables: +[%+ cgi.param('sow_vendor_deliverables') %] + +Start Date: +[%+ cgi.param('sow_start_date') %] + +End Date: +[%+ cgi.param('sow_end_date') %] + +Rate of Pay: +[%+ cgi.param('sow_vendor_payment') %] + +Basis for Payment: +[%+ cgi.param('sow_vendor_payment_basis') %] + +Cap on reimbursement expenses: +[%+ cgi.param('sow_vendor_cap_expenses') %] + +Average/Maximum Hours: +[%+ cgi.param('sow_vendor_hours') %] + +Payment Schedule: +[%+ cgi.param('sow_vendor_payment_schedule') %] + +Total Not to Exceed Amount: +[%+ cgi.param('sow_vendor_total_max') %] + +Any Special Terms: +[%+ cgi.param('sow_vendor_special_terms') || 'None' %] + +Where will the services be provided?: +[%+ cgi.param('vendor_services_where') %] [% END %] 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 736daad31..daf900a5e 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 @@ -11,15 +11,27 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Project Review" generate_api_token = 1 - style_urls = [ 'extensions/MozProjectReview/web/style/moz_project_review.css' ] + style_urls = [ 'skins/custom/create_bug.css', + 'extensions/MozProjectReview/web/style/moz_project_review.css' + 'js/jquery/plugins/datetimepicker/datetimepicker.css' ] javascript_urls = [ 'js/field.js', 'js/util.js', 'extensions/MozProjectReview/web/js/moz_project_review.js' ] - yui = [ 'calendar' ] + jquery = ["datetimepicker" ] %] +
+
+ Other task-specific [% terms.bug %] forms exist that should be used if appropriate: + +
+
+

- Please use this form for submitting a Mozilla Project Review - If you have a [% terms.bug %] to file, go here. + Please use this form for submitting a contract request, spend approval request and/or vendor review request.

@@ -27,47 +39,67 @@ Required Field)

-
- - + + + - + +
Initial Questions
-
- Project/Feature Name: +
+ What are you doing?: + +
Select one from the list
+ +
+ + +
+ +
+ Description: -
Be brief yet descriptive as possible. Include name of product, - feature, or name of vendor involved as well if appropriate.
- +
+ Expand on the request, but most needed information will be requested in later questions. +
+
-
- Tracking [% terms.Bug %] ID: +
+ Vendor/Contractor/Partner Name: -
Master tracking [% terms.bug %] number (if it exists)?
- +
Name of other party involved
+
-
- Points of Contact: +
+ Cc: -
Who are the points of contact for this review?
[% INCLUDE global/userselect.html.tmpl id => "cc" name => "cc" - value => "" size => 60 classes => ["bz_userfield"] multiple => 5 @@ -75,28 +107,12 @@
-
- Description: - -
Please provide a short description of the feature / application / project / - business relationship (e.g. problem solved, use cases, etc.)
- - -
- -
- Additional Information: - -
Please provide links to additional information (e.g. feature page, wiki) - if available and not yet included in feature description.)
- - -
-
Key Initiative: -
Which key initiative does this support?
+
+ Which key initiative does this support? +
- -
- -
-   - - - -
- -
- Release Date: - -
What is your overall key release / launch date / go live date?
- - -
- - -
- -
- Project Status: - -
What is the current state of your project?
- +
+
- Mozilla Data: + Data Access -
Does this product/service/project access, interact with, or store Mozilla - (customer, contributor, user, employee) data? Example of such data includes - email addresses, first and last name, addresses, phone numbers, credit card data.)
+
+ Will the vendor or the vendor's systems access, interact with, or + store customer, contributor, user, or employee data? Examples of such + data include email addresses, first and last name, addresses, phone + numbers, credit card data.) +
+
-