summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-12-12 03:48:00 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-12-12 03:48:00 +0100
commitb4d57a7e6b4e8f1dc540d6b0ed651f990e5c3213 (patch)
treea3092116722a8f0f904d1ef261a06a692a842e95 /extensions
parent7ef08cc7c04992fb524f7f6b802ede78e6671f3b (diff)
downloadbugzilla-b4d57a7e6b4e8f1dc540d6b0ed651f990e5c3213.tar.gz
bugzilla-b4d57a7e6b4e8f1dc540d6b0ed651f990e5c3213.tar.xz
Bug 819022 - Project Kickoff Form: Add "Vendor" and "Line Item in Budget?" in the Finance portion
Diffstat (limited to 'extensions')
-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.tmpl38
-rw-r--r--extensions/MozProjectReview/web/js/moz_project_review.js6
3 files changed, 39 insertions, 12 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 1fc72de6f..99691c287 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
@@ -13,6 +13,12 @@
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 %]
What is the purchase for?:
[%+ cgi.param('finance_purchase_what') %]
Why is the purchase needed?:
@@ -21,6 +27,5 @@ What is the risk if not purchased?:
[%+ cgi.param('finance_purchase_risk') %]
What is the alternative?:
[%+ cgi.param('finance_purchase_alternative') %]
-Is this line item in budget?: [% cgi.param('finance_purchase_inbudget') %]
What is the urgency?: [% cgi.param('finance_purchase_urgency') %]
Total Cost: [% cgi.param('finance_purchase_cost') %]
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 a84bbe743..db06d0c24 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
@@ -507,6 +507,33 @@
<div id="finance_questions" class="bz_default_hidden">
<div class="header">Finance</div>
+ <div id="finance_purchase_vendor_row" class="field_row">
+ <span class="field_label required">Vendor:</span>
+ <span class="field_data">
+ <input type="text" name="finance_purchase_vendor" maxsize="255" size="60" id="finance_purchase_vendor">
+ </span>
+ </div>
+
+ <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"
+ onchange="MPR.toggleVisibleById(this, 'No', 'finance_purchase_notinbudget_why_row');">
+ <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>
+ </span>
+ </div>
+
<div id="finance_purchase_what_row" class="field_row">
<span class="field_label required">What is the purchase for?:</span>
<span class="field_data">
@@ -535,17 +562,6 @@
</span>
</div>
- <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_urgency_row" class="field_row">
<span class="field_label required">When do the items need to be ordered by?:</span>
<span class="field_data">
diff --git a/extensions/MozProjectReview/web/js/moz_project_review.js b/extensions/MozProjectReview/web/js/moz_project_review.js
index 8aea8796b..29e765ad2 100644
--- a/extensions/MozProjectReview/web/js/moz_project_review.js
+++ b/extensions/MozProjectReview/web/js/moz_project_review.js
@@ -23,6 +23,7 @@ MPR.required_fields = {
"separate_party": "Please select a value for separate party in the initial questions section"
},
"finance_questions": {
+ "finance_purchase_vendor": "Please enter a value for vendor in the finance questions section",
"finance_purchase_what": "Please enter a value for what in the finance questions section",
"finance_purchase_why": "Please enter a value for why in the finance questions section",
"finance_purchase_risk": "Please enter a value for risk in the finance questions section",
@@ -121,6 +122,11 @@ MPR.validateAndSubmit = function () {
if (!MPR.isFilledOut('vendor_cost')) alert_text += "Please select a value for vendor cost\n";
}
+ if (Dom.get('finance_purchase_inbudget').value == 'No') {
+ if (!MPR.isFilledOut('finance_purchase_notinbudget_why'))
+ alert_text += "Please include additional description for the out of budget line item\n";
+ }
+
if (alert_text) {
alert(alert_text);
return false;