From 887524670413292b71448bd0c67ab2b786c78b49 Mon Sep 17 00:00:00 2001 From: Byron Jones <glob@mozilla.com> Date: Tue, 10 Mar 2015 13:13:49 +0800 Subject: Bug 1139749: backport bug 1128853 to bmo (Bugzilla shouldn't try to write API tokens into the shadow DB) --- .../en/default/bug/create/create-automative.html.tmpl | 1 + .../template/en/default/bug/create/create-costume.html.tmpl | 1 + .../en/default/bug/create/create-creative.html.tmpl | 1 + .../en/default/bug/create/create-data-compliance.html.tmpl | 1 + .../bug/create/create-dev-engagement-event.html.tmpl | 1 + .../BMO/template/en/default/bug/create/create-doc.html.tmpl | 1 + .../template/en/default/bug/create/create-finance.html.tmpl | 1 + .../en/default/bug/create/create-fxos-betaprogram.html.tmpl | 1 + .../en/default/bug/create/create-fxos-mcts-waiver.html.tmpl | 1 + .../en/default/bug/create/create-fxos-partner.html.tmpl | 1 + .../en/default/bug/create/create-fxos-preload-app.html.tmpl | 1 + .../BMO/template/en/default/bug/create/create-ipp.html.tmpl | 1 + .../en/default/bug/create/create-itrequest.html.tmpl | 1 + .../template/en/default/bug/create/create-legal.html.tmpl | 1 + .../template/en/default/bug/create/create-mozlist.html.tmpl | 1 + .../template/en/default/bug/create/create-mozpr.html.tmpl | 1 + .../en/default/bug/create/create-recruiting.html.tmpl | 13 +++++++------ .../template/en/default/bug/create/create-swag.html.tmpl | 1 + .../en/default/bug/create/create-user-engagement.html.tmpl | 1 + .../en/default/bug/create/create-web-bounty.html.tmpl | 1 + .../en/default/bug/create/create-webops-request.html.tmpl | 1 + .../template/en/default/bug/create/create-winqual.html.tmpl | 1 + .../en/default/pages/attachment_bounty_form.html.tmpl | 1 + .../template/en/default/pages/group_membership.html.tmpl | 1 + .../BMO/template/en/default/pages/triage_reports.html.tmpl | 1 + .../BMO/template/en/default/pages/user_activity.html.tmpl | 1 + 26 files changed, 32 insertions(+), 6 deletions(-) (limited to 'extensions/BMO/template/en') diff --git a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl index cbe2da910..62d37e227 100644 --- a/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-automative.html.tmpl @@ -82,6 +82,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Automation Request Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl index 5db30bbef..0d8347177 100644 --- a/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-costume.html.tmpl @@ -126,6 +126,7 @@ YAHOO.util.Event.onDOMReady(function() { [% PROCESS global/header.html.tmpl title = "Firefox Costume Request Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl index 56614f926..1e18b71de 100644 --- a/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-creative.html.tmpl @@ -111,6 +111,7 @@ function toggleTypeOther(element) { [% PROCESS global/header.html.tmpl title = "Creative Initiation Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl index 4306ef0e1..f24fd340d 100644 --- a/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-data-compliance.html.tmpl @@ -62,6 +62,7 @@ [% PROCESS global/header.html.tmpl title = "Data Compliance Form" + generate_api_token = 1 style = inline_css style_urls = [ 'skins/standard/enter_bug.css' ] javascript = inline_javascript diff --git a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl index c2f609727..ee1a29bba 100644 --- a/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-dev-engagement-event.html.tmpl @@ -39,6 +39,7 @@ [% PROCESS global/header.html.tmpl title = "Developer Events Request Form" + generate_api_token = 1 style = inline_css style_urls = [ 'skins/standard/enter_bug.css' ] javascript_urls = [ 'js/field.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl index 5b75976d9..00ea21c0f 100644 --- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl @@ -35,6 +35,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Developer Documentation Request" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl index fa8dc5f5b..d7734f042 100644 --- a/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-finance.html.tmpl @@ -62,6 +62,7 @@ [% PROCESS global/header.html.tmpl title = "Finance" + generate_api_token = 1 style = inline_style style_urls = [ 'skins/standard/enter_bug.css' ] javascript = inline_js diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl index 3f8bbdd71..3b8a3fe67 100644 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-betaprogram.html.tmpl @@ -57,6 +57,7 @@ [% PROCESS global/header.html.tmpl title = "Firefox OS Beta Program $terms.Bug Submission" + generate_api_token = 1 style = inline_css style_urls = [ 'skins/standard/enter_bug.css' ] javascript = inline_js diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl index bfd624a8a..da75f7eb2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-mcts-waiver.html.tmpl @@ -84,6 +84,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Firefox OS MCTS Waiver Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl index 3e910990d..69030bd3f 100644 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-partner.html.tmpl @@ -66,6 +66,7 @@ [% PROCESS global/header.html.tmpl title = "Firefox OS Partner $terms.Bug Submission" + generate_api_token = 1 style_urls = [ 'skins/standard/enter_bug.css' ] javascript = inline_js javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl index 7d7a16d06..105dc13ac 100644 --- a/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-fxos-preload-app.html.tmpl @@ -82,6 +82,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Firefox OS Pre-load App" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl index fb59cfeb3..5e5e3b6c2 100644 --- a/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-ipp.html.tmpl @@ -56,6 +56,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Internet Public Policy Issue" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl index e3ff09284..ead28cd03 100644 --- a/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-itrequest.html.tmpl @@ -81,6 +81,7 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Corporation/Foundation IT Requests" + generate_api_token = 1 javascript = inline_javascript javascript_urls = [ 'js/field.js' ] yui = [ 'autocomplete' ] diff --git a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl index 5abe79597..1b950475c 100644 --- a/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-legal.html.tmpl @@ -23,6 +23,7 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Corporation Legal Requests" + generate_api_token = 1 style_urls = [ 'skins/standard/attachment.css' ] javascript_urls = [ 'js/attachment.js', 'js/field.js' ] yui = [ 'autocomplete' ] diff --git a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl index 38c08c72f..078c82272 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozlist.html.tmpl @@ -10,6 +10,7 @@ [% PROCESS global/header.html.tmpl title = "Mozilla Discussion Forum" + generate_api_token = 1 javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', 'js/field.js' ] yui = [ 'autocomplete' ] diff --git a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl index 2f0d8c2dd..91921b43e 100644 --- a/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-mozpr.html.tmpl @@ -269,6 +269,7 @@ function validate_form() { [% PROCESS global/header.html.tmpl title = "PR Project Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl index 62ca60e61..b6033275b 100644 --- a/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-recruiting.html.tmpl @@ -58,12 +58,13 @@ function jobDescToggle(what) { [% END %] [% PROCESS global/header.html.tmpl - title = "Mozilla Corporation HR and Recruiting Requests" - style_urls = [ 'skins/standard/attachment.css' ] - javascript_urls = [ 'js/attachment.js', 'js/field.js' ] - style = inline_style - javascript = inline_javascript - yui = [ 'autocomplete' ] + title = "Mozilla Corporation HR and Recruiting Requests" + generate_api_token = 1 + style_urls = [ 'skins/standard/attachment.css' ] + javascript_urls = [ 'js/attachment.js', 'js/field.js' ] + style = inline_style + javascript = inline_javascript + yui = [ 'autocomplete' ] %] [% IF user.in_group("mozilla-employee-confidential") diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl index b766e324b..8d2b14881 100644 --- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl @@ -582,6 +582,7 @@ function showGear() { [% PROCESS global/header.html.tmpl title = "Mozilla Gear" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl index f523b205b..a6d5b8e1f 100644 --- a/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-user-engagement.html.tmpl @@ -76,6 +76,7 @@ function toggleGoalOther() { [% PROCESS global/header.html.tmpl title = "User Engagement Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl index a15543375..0be58f813 100644 --- a/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-web-bounty.html.tmpl @@ -59,6 +59,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Web Bounty Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-webops-request.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-webops-request.html.tmpl index 83197a755..54a09c2de 100644 --- a/extensions/BMO/template/en/default/bug/create/create-webops-request.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-webops-request.html.tmpl @@ -66,6 +66,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "WebOps Request Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl index fd21ed4ed..524ec6781 100644 --- a/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-winqual.html.tmpl @@ -30,6 +30,7 @@ [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ] style_urls = [ 'skins/standard/attachment.css', 'skins/standard/enter_bug.css', diff --git a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl index 230fab3d9..e458d0111 100644 --- a/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl +++ b/extensions/BMO/template/en/default/pages/attachment_bounty_form.html.tmpl @@ -119,6 +119,7 @@ function validateAndSubmit() { [% PROCESS global/header.html.tmpl title = "Bounty Attachment Form" + generate_api_token = 1 style = inline_style javascript = inline_javascript javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', diff --git a/extensions/BMO/template/en/default/pages/group_membership.html.tmpl b/extensions/BMO/template/en/default/pages/group_membership.html.tmpl index 32484b13f..9218d44ed 100644 --- a/extensions/BMO/template/en/default/pages/group_membership.html.tmpl +++ b/extensions/BMO/template/en/default/pages/group_membership.html.tmpl @@ -8,6 +8,7 @@ [% PROCESS global/header.html.tmpl title = "Group Membership Report" + generate_api_token = 1 yui = [ 'autocomplete' ] style_urls = [ "extensions/BMO/web/styles/reports.css" ] javascript_urls = [ "js/field.js" ] diff --git a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl index a7f26e86d..a8cc85509 100644 --- a/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl +++ b/extensions/BMO/template/en/default/pages/triage_reports.html.tmpl @@ -40,6 +40,7 @@ var selected_components = [ [% INCLUDE global/header.html.tmpl title = "Triage Reports" + generate_api_token = 1 yui = [ 'autocomplete', 'calendar' ] javascript = js_data javascript_urls = [ "js/util.js", "js/field.js", "js/productform.js", diff --git a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl index c9b46b2eb..2ba463247 100644 --- a/extensions/BMO/template/en/default/pages/user_activity.html.tmpl +++ b/extensions/BMO/template/en/default/pages/user_activity.html.tmpl @@ -14,6 +14,7 @@ [% INCLUDE global/header.html.tmpl title = "User Activity Report" _ who_title + generate_api_token = 1 yui = [ 'autocomplete', 'calendar' ] javascript_urls = [ "js/util.js", "js/field.js" ] style_urls = [ "extensions/BMO/web/styles/reports.css" ] -- cgit v1.2.3-24-g4f1b