summaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/create/create-guided.html.tmpl26
-rw-r--r--template/en/default/bug/create/create.html.tmpl27
2 files changed, 25 insertions, 28 deletions
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index fc15e5ce5..9b1cf39fe 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -51,7 +51,7 @@
[%# This script displays the descriptions for selected components. %]
<script type="text/javascript">
var descriptions = [
-[% FOREACH c = component_ %]
+[% FOREACH c = product.components %]
'[% c.description FILTER js %]',
[% END %]
];
@@ -112,12 +112,12 @@ function PutDescription() {
</p>
[%# Include other products if sensible %]
-[% IF product == "Firefox" %]
+[% IF product.name == "Firefox" %]
[% productstring = "product=Mozilla%20Application%20Suite&amp;product=Firefox" %]
-[% ELSIF product == "Thunderbird" %]
+[% ELSIF product.name == "Thunderbird" %]
[% productstring = "product=Mozilla%20Application%20Suite&amp;product=Thunderbird" %]
[% ELSE %]
- [% productstring = BLOCK %]product=[% product FILTER url_quote %][% END %]
+ [% productstring = BLOCK %]product=[% product.name FILTER url_quote %][% END %]
[% END %]
<p>
@@ -142,11 +142,11 @@ function PutDescription() {
<input type="hidden" name="format" value="simple">
<input type="hidden" name="order" value="relevance desc">
<input type="hidden" name="bug_status" value="__all__">
- <input type="hidden" name="product" value="[% product FILTER html %]">
- [% IF product == "Firefox" OR
- product == "Thunderbird" OR
- product == "Mozilla Application Suite" OR
- product == "Camino" %]
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
+ [% IF product.name == "Firefox" OR
+ product.name == "Thunderbird" OR
+ product.name == "Mozilla Application Suite" OR
+ product.name == "Camino" %]
<input type="hidden" name="product" value="Core">
<input type="hidden" name="product" value="Toolkit">
<input type="hidden" name="product" value="PSM">
@@ -194,8 +194,8 @@ function PutDescription() {
<b>Product</b>
</td>
<td valign="top">
- <input type="hidden" name="product" value="[% product FILTER html %]">
- [% product FILTER html %]
+ <input type="hidden" name="product" value="[% product.name FILTER html %]">
+ [% product.name FILTER html %]
</td>
</tr>
@@ -209,7 +209,7 @@ function PutDescription() {
<td valign="top">
<select name="component" id="component"
size="5" onchange="PutDescription()">
- [% FOREACH c = component_ %]
+ [% FOREACH c = product.components %]
<option value="[% c.name FILTER html %]"
[% " selected=\"selected\"" IF c == default.component_ %]>
[% c.name FILTER html %]
@@ -236,7 +236,7 @@ function PutDescription() {
To pick the right component, you could use the same one as
similar [% terms.bugs %] you found in your search, or read the full list of
<a target="_blank" href="describecomponents.cgi?product=
- [% product FILTER url_quote %]">component
+ [% product.name FILTER url_quote %]">component
descriptions</a> (opens in new window) if you need more help.
</p>
</td>
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index eddb8bc68..a0b186072 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -21,32 +21,29 @@
# Shane H. W. Travis <travis@sedsystems.ca>
#%]
-[% PROCESS global/variables.none.tmpl %]
[% PROCESS "global/field-descs.none.tmpl" %]
-[% product_name = product FILTER html %]
[% PROCESS global/header.html.tmpl
- title = "Enter $terms.Bug: $product_name"
+ title = "Enter $terms.Bug: $product.name"
onload="set_assign_to();"
%]
-[% USE Bugzilla %]
<script type="text/javascript">
<!--
-var initialowners = new Array([% component_.size %]);
+var initialowners = new Array([% product.components.size %]);
var last_initialowner;
-var components = new Array([% component_.size %]);
+var components = new Array([% product.components.size %]);
[% IF Param("useqacontact") %]
- var initialqacontacts = new Array([% component_.size %]);
+ var initialqacontacts = new Array([% product.components.size %]);
var last_initialqacontact;
[% END %]
[% count = 0 %]
-[%- FOREACH c = component_ %]
+[%- FOREACH c = product.components %]
components[[% count %]] = "[% c.name FILTER js %]";
- initialowners[[% count %]] = "[% c.initialowner FILTER js %]";
+ initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]";
[% IF Param("useqacontact") %]
- initialqacontacts[[% count %]] = "[% c.initialqacontact FILTER js %]";
+ initialqacontacts[[% count %]] = "[% c.default_qa_contact.login FILTER js %]";
[% END %]
[% count = count + 1 %]
[%- END %]
@@ -93,7 +90,7 @@ function set_assign_to() {
</script>
<form name="Create" id="Create" method="post" action="post_bug.cgi">
-<input type="hidden" name="product" value="[% product FILTER html %]">
+<input type="hidden" name="product" value="[% product.name FILTER html %]">
<input type="hidden" name="token" value="[% token FILTER html %]">
<table cellspacing="2" cellpadding="0" border="0">
@@ -118,10 +115,10 @@ function set_assign_to() {
<tr>
<td align="right" valign="top"><strong>Reporter:</strong></td>
- <td valign="top">[% Bugzilla.user.login FILTER html %]</td>
+ <td valign="top">[% user.login FILTER html %]</td>
<td align="right" valign="top"><strong>Product:</strong></td>
- <td valign="top">[% product FILTER html %]</td>
+ <td valign="top">[% product.name FILTER html %]</td>
</tr>
[%# We can't use the select block in these two cases for various reasons. %]
@@ -141,13 +138,13 @@ function set_assign_to() {
<td align="right" valign="top">
<strong>
- <a href="describecomponents.cgi?product=[% product FILTER url_quote %]">
+ <a href="describecomponents.cgi?product=[% product.name FILTER url_quote %]">
Component</a>:
</strong>
</td>
<td>
<select name="component" onchange="set_assign_to();" size="5">
- [%- FOREACH c = component_ %]
+ [%- FOREACH c = product.components %]
<option value="[% c.name FILTER html %]"
[% " selected=\"selected\"" IF c.name == default.component_ %]>
[% c.name FILTER html -%]