diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2010-07-06 00:15:12 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2010-07-06 00:15:12 +0200 |
| commit | 97fc35368cde9f7d5bd98c91ef4fa9d29786bc34 (patch) | |
| tree | 747c6b89b135860dcc7ffb24ca54b4d67d862ccd | |
| parent | bcab6fcb10aa88683490bef03c607173f9c0b063 (diff) | |
| download | bugzilla-97fc35368cde9f7d5bd98c91ef4fa9d29786bc34.tar.gz bugzilla-97fc35368cde9f7d5bd98c91ef4fa9d29786bc34.tar.xz | |
Bug 564433: Localized values are not displayed in the "Field only appears when" field when editing custom fields
r/a=mkanat
| -rw-r--r-- | template/en/default/admin/custom_fields/cf-js.js.tmpl | 5 | ||||
| -rw-r--r-- | template/en/default/admin/custom_fields/edit.html.tmpl | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/template/en/default/admin/custom_fields/cf-js.js.tmpl b/template/en/default/admin/custom_fields/cf-js.js.tmpl index 4c95a1690..528b88b2d 100644 --- a/template/en/default/admin/custom_fields/cf-js.js.tmpl +++ b/template/en/default/admin/custom_fields/cf-js.js.tmpl @@ -31,9 +31,10 @@ var select_values = new Array(); [%# Prefix components with the name of their product so that admins know which component we're talking about. #%] [% IF sel_field.name == 'component' %] - [% SET value_name = legal_value.product.name _ ': ' _ legal_value.name %] + [% SET value_name = display_value('product', legal_value.product.name) _ ': ' + _ display_value(sel_field.name, legal_value.name) %] [% ELSE %] - [% SET value_name = legal_value.name %] + [% SET value_name = display_value(sel_field.name, legal_value.name) %] [% END %] [[% legal_value.id FILTER js %], '[% value_name FILTER js %]'][% ',' UNLESS loop.last %] [% END %] diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl index 4c1bbbeb0..755c3642c 100644 --- a/template/en/default/admin/custom_fields/edit.html.tmpl +++ b/template/en/default/admin/custom_fields/edit.html.tmpl @@ -125,9 +125,9 @@ [% ' selected="selected"' IF field.visibility_value.id == value.id %]> [% IF field.visibility_field.name == 'component' %] - [% value.product.name FILTER html %]: + [% display_value('product', value.product.name) FILTER html %]: [% END %] - [%+ value.name FILTER html %] + [%+ display_value(field.visibility_field.name, value.name) FILTER html %] </option> [% END %] </select> |