From 887524670413292b71448bd0c67ab2b786c78b49 Mon Sep 17 00:00:00 2001 From: Byron Jones 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) --- template/en/default/account/prefs/prefs.html.tmpl | 1 + template/en/default/admin/components/create.html.tmpl | 1 + template/en/default/admin/components/edit.html.tmpl | 1 + template/en/default/admin/products/create.html.tmpl | 1 + template/en/default/admin/sudo.html.tmpl | 1 + template/en/default/attachment/create.html.tmpl | 1 + template/en/default/attachment/edit.html.tmpl | 1 + template/en/default/bug/create/create.html.tmpl | 1 + template/en/default/bug/show-header.html.tmpl | 1 + template/en/default/bug/summarize-time.html.tmpl | 1 + template/en/default/global/header.html.tmpl | 4 +++- template/en/default/list/list.html.tmpl | 1 + template/en/default/request/queue.html.tmpl | 1 + template/en/default/search/search-advanced.html.tmpl | 1 + template/en/default/search/search-create-series.html.tmpl | 1 + template/en/default/search/search-report-graph.html.tmpl | 1 + template/en/default/search/search-report-table.html.tmpl | 1 + 17 files changed, 19 insertions(+), 1 deletion(-) (limited to 'template') diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 65649b814..289a155ea 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -39,6 +39,7 @@ [% PROCESS global/header.html.tmpl title = "User Preferences" subheader = filtered_login + generate_api_token = 1 style_urls = ['skins/standard/admin.css'] javascript_urls = ['js/util.js', 'js/field.js', 'js/TUI.js'] doc_section = "userpreferences.html" diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl index c3b691d83..a95d45399 100644 --- a/template/en/default/admin/components/create.html.tmpl +++ b/template/en/default/admin/components/create.html.tmpl @@ -29,6 +29,7 @@ yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] title = title + generate_api_token = 1 %]
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl index 5236186cc..874310ac8 100644 --- a/template/en/default/admin/components/edit.html.tmpl +++ b/template/en/default/admin/components/edit.html.tmpl @@ -33,6 +33,7 @@ [% END %] [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 yui = [ 'autocomplete' ] javascript_urls = [ "js/field.js" ] %] diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl index 3af81fb23..d2167c64b 100644 --- a/template/en/default/admin/products/create.html.tmpl +++ b/template/en/default/admin/products/create.html.tmpl @@ -24,6 +24,7 @@ [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 style_urls = ['skins/standard/admin.css'] javascript_urls = ['js/util.js'] %] diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl index 676959c34..c96a68ec1 100644 --- a/template/en/default/admin/sudo.html.tmpl +++ b/template/en/default/admin/sudo.html.tmpl @@ -22,6 +22,7 @@ [% PROCESS global/header.html.tmpl title = "Begin sudo session" + generate_api_token = 1 style_urls = ['skins/standard/admin.css'] doc_section = "useradmin.html#impersonatingusers" %] diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl index ad2b13a99..0380f7ddd 100644 --- a/template/en/default/attachment/create.html.tmpl +++ b/template/en/default/attachment/create.html.tmpl @@ -33,6 +33,7 @@ title = title header = header subheader = subheader + generate_api_token = 1 style_urls = [ 'skins/standard/attachment.css' ] yui = [ 'autocomplete' ] javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ] diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl index e29c45c94..9a1763642 100644 --- a/template/en/default/attachment/edit.html.tmpl +++ b/template/en/default/attachment/edit.html.tmpl @@ -37,6 +37,7 @@ title = title header = header subheader = subheader + generate_api_token = 1 doc_section = "attachments.html" javascript_urls = ['js/attachment.js', 'js/field.js'] style_urls = ['skins/standard/attachment.css'] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 4e37e20bf..e258a0d73 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.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/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl index 062e1aa82..4fc1ebe0f 100644 --- a/template/en/default/bug/show-header.html.tmpl +++ b/template/en/default/bug/show-header.html.tmpl @@ -36,6 +36,7 @@ [% title = title _ "($bug.alias) " %] [% END %] [% title = title _ filtered_desc %] +[% generate_api_token = 1 %] [% header = "$terms.Bug $bug.bug_id" %] [% header_addl_info = "Last modified: $filtered_timestamp" %] [% yui = ['autocomplete', 'calendar'] %] diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl index 21c26e8c8..0166539ea 100644 --- a/template/en/default/bug/summarize-time.html.tmpl +++ b/template/en/default/bug/summarize-time.html.tmpl @@ -29,6 +29,7 @@ [% PROCESS global/header.html.tmpl title = title + generate_api_token = 1 header = header style_urls = ["skins/standard/summarize-time.css"] doc_section = "timetracking.html" diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 3151a96dd..5528a96c2 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -35,6 +35,7 @@ # style_urls: list. List of URLs to CSS style sheets. # message: string. A message to display to the user. May contain HTML. # atomlink: Atom link URL, May contain HTML + # generate_api_token: generate a token which can be used to make authenticated webservice calls #%] [% IF message %] @@ -52,6 +53,7 @@ no_yui = 0 jquery = [] jquery_css = [] + generate_api_token = 0 %] [% IF NOT no_yui %] @@ -226,7 +228,7 @@ version_required: 'You must select a Version for this [% terms.bug %].' } - [% IF javascript_urls.containsany(['js/bug.js', 'js/field.js', 'js/comment-tagging.js']) %] + [% IF generate_api_token %] , api_token: '[% get_api_token FILTER js FILTER html %]' [% END %] }; diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl index e7b635395..73e58c30f 100644 --- a/template/en/default/list/list.html.tmpl +++ b/template/en/default/list/list.html.tmpl @@ -45,6 +45,7 @@ [% url_filtered_title = title FILTER uri %] [% PROCESS global/header.html.tmpl title = title + generate_api_token = dotweak style = style atomlink = "buglist.cgi?$urlquerypart&title=$url_filtered_title&ctype=atom" yui = [ 'autocomplete', 'calendar' ] diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index e9862f7c3..d1920a132 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -25,6 +25,7 @@ [% PROCESS global/header.html.tmpl title="Request Queue" + generate_api_token = 1 onload="var f = document.request_form; selectProduct(f.product, f.component, null, null, 'Any');" javascript_urls=["js/productform.js", "js/field.js"] style_urls = ['skins/standard/buglist.css'] diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index 780d54edd..f42a9cb00 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -42,6 +42,7 @@ function remove_token() { [% PROCESS global/header.html.tmpl title = "Search for $terms.bugs" + generate_api_token = 1 onload = "doOnSelectProduct(0);" javascript = js_data yui = [ 'autocomplete', 'calendar' ] diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index 3ca68ac49..85d54e51c 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -32,6 +32,7 @@ [% PROCESS global/header.html.tmpl title = "Create New Data Set" + generate_api_token = 1 onload = "doOnSelectProduct(0);" yui = [ 'autocomplete', 'calendar' ] javascript = js_data diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 3c894cf73..383e10220 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -31,6 +31,7 @@ var queryform = "reportform" [% PROCESS global/header.html.tmpl title = "Generate Graphical Report" + generate_api_token = 1 onload = "doOnSelectProduct(0); chartTypeChanged()" yui = [ 'autocomplete', 'calendar' ] javascript = js_data diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index 7e087e7fe..872773b07 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -31,6 +31,7 @@ var queryform = "reportform" [% PROCESS global/header.html.tmpl title = "Generate Tabular Report" + generate_api_token = 1 onload = "doOnSelectProduct(0)" yui = [ 'autocomplete', 'calendar' ] javascript = js_data -- cgit v1.2.3-24-g4f1b