summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2016-01-04 23:47:11 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2016-01-04 23:47:11 +0100
commitf709156da6e562a4466d45c9422ff0a111aaa7e0 (patch)
tree7c358b7cc4b280176447f16fad3462fff067a446 /template
parent9f5a8a28783f66b15973ac3714d10d1c0fa05f6d (diff)
downloadbugzilla-f709156da6e562a4466d45c9422ff0a111aaa7e0.tar.gz
bugzilla-f709156da6e562a4466d45c9422ff0a111aaa7e0.tar.xz
Bug 1191706: When editing flag types, components do not match the selected product when classifications are enabled
r=dkl
Diffstat (limited to 'template')
-rw-r--r--template/en/default/admin/flag-type/edit.html.tmpl4
-rw-r--r--template/en/default/admin/flag-type/list.html.tmpl4
-rw-r--r--template/en/default/global/js-products.html.tmpl5
-rw-r--r--template/en/default/request/queue.html.tmpl31
4 files changed, 10 insertions, 34 deletions
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 6c0e0cb78..7505ebd8c 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -23,7 +23,7 @@
title = title
style_urls = ['skins/standard/admin.css']
onload="var f = document.forms['flagtype_properties'];
- selectProduct(f.product, f.component, null, null, '__Any__');"
+ selectProduct(f.product, f.component, '__Any__');"
javascript_urls=["js/productform.js"]
doc_section = "administering/flags.html"
%]
@@ -92,7 +92,7 @@
id => "product"
name => "product"
add => "__Any__"
- onchange => "selectProduct(this, this.form.component, null, null, '__Any__');"
+ onchange => "selectProduct(this, this.form.component, '__Any__');"
products => products
%]<br>
<select name="component">
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl
index b91b49199..b1665c3b0 100644
--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -11,7 +11,7 @@
[% PROCESS global/header.html.tmpl
title = 'Administer Flag Types'
style_urls = ['skins/standard/admin.css']
- onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');"
+ onload="var f = document.flagtype_form; selectProduct(f.product, f.component, '__All__');"
javascript_urls=["js/productform.js"]
doc_section = "administering/flags.html"
%]
@@ -43,7 +43,7 @@
id => "product"
name => "product"
add => "__Any__"
- onchange => "selectProduct(this, this.form.component, null, null, '__Any__');"
+ onchange => "selectProduct(this, this.form.component, '__Any__');"
products => products
%]
</div>
diff --git a/template/en/default/global/js-products.html.tmpl b/template/en/default/global/js-products.html.tmpl
index e40a3e3ae..940a5e64d 100644
--- a/template/en/default/global/js-products.html.tmpl
+++ b/template/en/default/global/js-products.html.tmpl
@@ -8,14 +8,13 @@
[%# The javascript block gets used in header.html.tmpl. %]
[% javascript = BLOCK %]
- var useclassification = false; // No classification level in use
var first_load = true; // Is this the first time we load the page?
var last_sel = []; // Caches last selection
var cpts = new Array();
+
[% n = 1 %]
[% FOREACH prod = products %]
- cpts['[% n %]'] = [
- [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
+ cpts['[% n %]'] = [[% FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%]];
[% n = n+1 %]
[% END %]
[% END %]
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index 4e406190d..fd3dbde8a 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -9,39 +9,16 @@
[% USE Bugzilla %]
[% cgi = Bugzilla.cgi %]
+[% PROCESS "global/js-products.html.tmpl" %]
+
[% 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');"
+ onload="var f = document.request_form; selectProduct(f.product, f.component, 'Any');"
javascript_urls=["js/productform.js", "js/field.js"]
style_urls = ['skins/standard/buglist.css']
%]
-<script type="text/javascript">
- var useclassification = false; // No classification level in use
- var first_load = true; // Is this the first time we load the page?
- var last_sel = []; // Caches last selection
- var cpts = new Array();
- [% n = 1 %]
- [% IF Param('useclassification') %]
- [% FOREACH clas = user.get_selectable_classifications %]
- [% FOREACH prod = user.get_selectable_products(clas.id) %]
- [%+ PROCESS js_comp %]
- [% END %]
- [% END %]
- [% ELSE %]
- [% FOREACH prod = user.get_selectable_products %]
- [%+ PROCESS js_comp %]
- [% END %]
- [% END %]
-</script>
-
-[% BLOCK js_comp %]
- cpts['[% n %]'] = [
- [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%]];
- [% n = n+1 %]
-[% END %]
-
<p>
When you are logged in, only requests made by you or addressed to you
are shown by default. You can change the criteria using the form below.
@@ -71,7 +48,7 @@ to some group are shown by default.
id => "product"
name => "product"
add => "Any"
- onchange => "selectProduct(this, this.form.component, null, null, 'Any');"
+ onchange => "selectProduct(this, this.form.component, 'Any');"
%]
</td>
<th>Flag:</th>