summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorMarc Schumann <wurblzap@gmail.com>2012-10-16 20:26:54 +0200
committerMarc Schumann <wurblzap@gmail.com>2012-10-16 20:26:54 +0200
commitaf38912df5c0f57ad40377119b91dd03d8f9b520 (patch)
treebd04fc880184f7b063e17d12af2d13ef1f5998cc /template/en
parentb60afed2cc7c8776217444049e5ebfadf5839a24 (diff)
downloadbugzilla-af38912df5c0f57ad40377119b91dd03d8f9b520.tar.gz
bugzilla-af38912df5c0f57ad40377119b91dd03d8f9b520.tar.xz
Bug 604388 - Filenames used to store data for Old Charts should be based on product IDs, not names (avoid dataloss when renaming products).
r/a=LpSolit
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/global/code-error.html.tmpl4
-rw-r--r--template/en/default/global/user-error.html.tmpl4
-rw-r--r--template/en/default/reports/old-charts.html.tmpl4
3 files changed, 4 insertions, 8 deletions
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 9fd326051..8945ba445 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -55,8 +55,8 @@
[% ELSIF error == "chart_data_not_generated" %]
[% admindocslinks = {'extraconfig.html' => 'Setting up Charting'} %]
- [% IF product %]
- Charts for the <em>[% product FILTER html %]</em> product are not
+ [% IF product.id %]
+ Charts for the <em>[% product.name FILTER html %]</em> product are not
available yet because no charting data has been collected for it since it
was created.
[% ELSE %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 39d07653c..e7d3061a9 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -962,10 +962,6 @@
[% title = "Invalid Parameter" %]
The new value for [% name FILTER html %] is invalid: [% err FILTER html %].
- [% ELSIF error == "invalid_product_name" %]
- [% title = "Invalid Product Name" %]
- The product name '[% product FILTER html %]' is invalid or does not exist.
-
[% ELSIF error == "invalid_regexp" %]
[% title = "Invalid regular expression" %]
The regular expression you entered is invalid.
diff --git a/template/en/default/reports/old-charts.html.tmpl b/template/en/default/reports/old-charts.html.tmpl
index 12a0cdd83..29098c160 100644
--- a/template/en/default/reports/old-charts.html.tmpl
+++ b/template/en/default/reports/old-charts.html.tmpl
@@ -28,9 +28,9 @@
<tr>
<th>Product:</th>
<td align="center">
- <select id="product" name="product">
+ <select id="product_id" name="product_id">
[% FOREACH product = products %]
- <option value="[% product FILTER html %]">[% product FILTER html %]</option>
+ <option value="[% product.id FILTER html %]">[% product.name || '-All-' FILTER html %]</option>
[% END %]
</select>
</td>