diff options
| author | mkanat%bugzilla.org <> | 2008-10-03 08:30:38 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2008-10-03 08:30:38 +0200 |
| commit | fab5d3a38aadaed1e6153c0fbd820449258586b2 (patch) | |
| tree | 2e1f8816d56aaf213fd9b4e6812b28ed3cbf8527 /template/en/default/global | |
| parent | 931bd3b651ccca832a618f7b28bbc35e503665d4 (diff) | |
| download | bugzilla-fab5d3a38aadaed1e6153c0fbd820449258586b2.tar.gz bugzilla-fab5d3a38aadaed1e6153c0fbd820449258586b2.tar.xz | |
Bug 455641: Implement Bugzilla::Field::Choice->update and have editvalues.cgi use it
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bbaetz, a=mkanat
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/messages.html.tmpl | 25 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 5 |
2 files changed, 17 insertions, 13 deletions
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index eb869a776..82a71a5a2 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -314,20 +314,23 @@ [% ELSIF message_tag == "field_value_updated" %] [% title = "Field Value Updated" %] - [% IF updated_value || updated_sortkey %] - Changes to the <em>[% value FILTER html %]</em> value of the + [% IF changes.keys.size %] + The <em>[% value FILTER html %]</em> value of the <em>[% field.description FILTER html %]</em> - (<em>[% field.name FILTER html %]</em>) field have been changed: + (<em>[% field.name FILTER html %]</em>) field has been changed: <ul> - [% IF updated_value %] - <li>Field value updated to <em>[% value FILTER html %]</em></li> - [% IF default_value_updated %] - (note that this value is the default for this field. All - references to the default value will now point to this new value) - [% END %] + [% IF changes.value %] + <li>Field value updated to + <em>[% changes.value.1 FILTER html %]</em>. + [% IF value_obj.is_default %] + (Note that this value is the default for this field. All + references to the default value will now point to this new value.) + [% END %] + </li> [% END %] - [% IF updated_sortkey %] - <li>Field value sortkey updated to <em>[% sortkey FILTER html %]</em></li> + [% IF changes.sortkey %] + <li>Sortkey updated to + <em>[% changes.sortkey.1 FILTER html %]</em>.</li> [% END %] </ul> [% ELSE %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index bcb6b6630..c306b692a 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -457,7 +457,8 @@ [% ELSIF error == "fieldvalue_not_editable" %] [% title = "Field Value Not Editable" %] The value '[% old_value FILTER html %]' cannot be renamed because - it plays some special role for the '[% field.description FILTER html %]' field. + it plays some special role for the '[% field.description FILTER html %]' + field. [% ELSIF error == "fieldvalue_not_deletable" %] [% title = "Field Value Not Deletable" %] @@ -470,7 +471,7 @@ [% ELSIF error == "fieldvalue_reserved_word" %] [% title = "Reserved Word Not Allowed" %] - You cannot use the '[% value FILTER html %]' value for the + You cannot use the value '[% value FILTER html %]' for the '[% field.description FILTER html %]' field. This value is used internally. Please choose another one. |