summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-05-14 19:11:19 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-05-14 19:11:19 +0200
commita8dcebe392d2b98380387be66d457d70d26d830c (patch)
tree00153d429601cc5dea4c3db3b321b386d6304609
parent1774b91d91558e53a9ec635e4001f805c4a897a8 (diff)
downloadbugzilla-a8dcebe392d2b98380387be66d457d70d26d830c.tar.gz
bugzilla-a8dcebe392d2b98380387be66d457d70d26d830c.tar.xz
Bug 841559 - Project Kickoff Form: Simplify finance question regrading budget
-rw-r--r--extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl7
-rw-r--r--extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl15
-rw-r--r--extensions/MozProjectReview/web/js/moz_project_review.js12
3 files changed, 4 insertions, 30 deletions
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 99691c287..60823019c 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
@@ -14,11 +14,8 @@
Finance Questions:
Vendor: [% cgi.param('finance_purchase_vendor') %]
-Is this line item in budget?: [% cgi.param('finance_purchase_inbudget') %]
-[% IF cgi.param('finance_purchase_inbudget') == 'No' %]
-Not In Budget Why:
-[%+ cgi.param('finance_purchase_notinbudget_why') %]
-[% END %]
+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?:
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 653058bc2..1764ade6e 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
@@ -645,19 +645,8 @@
<div id="finance_purchase_inbudget_row" class="field_row">
<span class="field_label required">Is this line item in budget?:</span>
<span class="field_data">
- <select name="finance_purchase_inbudget" id="finance_purchase_inbudget">
- <option value="">Select One</option>
- <option value="Yes">Yes</option>
- <option value="No">No</option>
- </select>
- </span>
- </div>
-
- <div id="finance_purchase_notinbudget_why_row" class="field_row bz_default_hidden">
- <span class="field_label required">Not In Budget Why:</span>
- <span class="field_data">
- <em>Please include additional description for this out of budget line item</em><br>
- <textarea name="finance_purchase_notinbudget_why" id="finance_purchase_notinbudget_why" rows="10" cols="80"></textarea>
+ <div class="field_description">If not, please explain purchase need and why not in budget.</div>
+ <textarea name="finance_purchase_inbudget" id="finance_purchase_inbudget" 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 0561c1693..5b217a800 100644
--- a/extensions/MozProjectReview/web/js/moz_project_review.js
+++ b/extensions/MozProjectReview/web/js/moz_project_review.js
@@ -68,7 +68,6 @@ var MPR = {
'legal_priority',
'legal_sow_vendor_product_line',
'legal_vendor_services_where',
- 'finance_purchase_inbudget',
'finance_purchase_urgency'
],
@@ -99,7 +98,6 @@ var MPR = {
key_initiative_other_row: false,
initial_separate_party_questions: false,
finance_questions: false,
- finance_purchase_notinbudget_why_row: false,
po_needed_row: false,
legal_questions: false,
legal_sow_questions: false,
@@ -166,10 +164,6 @@ var MPR = {
page_sections.legal_vendor_single_country = true;
}
- if (MPR.fieldValue('finance_purchase_inbudget') == 'No') {
- page_sections.finance_purchase_notinbudget_why_row = true;
- }
-
if (MPR.fieldValue('privacy_policy_project') == 'Yes') {
page_sections.privacy_policy_project_link_row = true;
}
@@ -243,12 +237,6 @@ var MPR = {
}
}
- if (MPR.fieldValue('finance_purchase_inbudget') == 'No') {
- if (!MPR.isFilledOut('finance_purchase_notinbudget_why')) {
- alert_text += "Please include additional description for the out of budget line item\n";
- }
- }
-
if (MPR.fieldValue('vendor_cost') == '<= $25,000'
&& MPR.fieldValue('po_needed') == '')
{