From a43231dd4ccef2b02fa0434217b637a6d1638c97 Mon Sep 17 00:00:00 2001 From: "mkanat%bugzilla.org" <> Date: Fri, 3 Oct 2008 06:40:15 +0000 Subject: Bug 456922: Now that Bugzilla::Field::Choice is complete, clean up editvalues.cgi and error messages Patch By Max Kanat-Alexander r=bbaetz, a=mkanat --- template/en/default/global/messages.html.tmpl | 16 +++++++-------- template/en/default/global/user-error.html.tmpl | 27 +++++++------------------ 2 files changed, 15 insertions(+), 28 deletions(-) (limited to 'template/en/default/global') diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl index 82a71a5a2..d7de4fbc7 100644 --- a/template/en/default/global/messages.html.tmpl +++ b/template/en/default/global/messages.html.tmpl @@ -298,31 +298,31 @@ [% ELSIF message_tag == "field_value_created" %] [% title = "New Field Value Created" %] - The value [% value FILTER html %] has been added as a valid choice - for the [% field.description FILTER html %] + The value [% value.name FILTER html %] has been added as a + valid choice for the [% field.description FILTER html %] ([% field.name FILTER html %]) field. [% IF field.name == "bug_status" %] - You should now visit the status workflow page - to include your new [% terms.bug %] status. + You should now visit the status workflow + page to include your new [% terms.bug %] status. [% END %] [% ELSIF message_tag == "field_value_deleted" %] [% title = "Field Value Deleted" %] - The value [% value FILTER html %] of the + The value [% value.name FILTER html %] of the [% field.description FILTER html %] ([% field.name FILTER html %]) field has been deleted. [% ELSIF message_tag == "field_value_updated" %] [% title = "Field Value Updated" %] [% IF changes.keys.size %] - The [% value FILTER html %] value of the + The [% value_old FILTER html %] value of the [% field.description FILTER html %] ([% field.name FILTER html %]) field has been changed: [% ELSE %] - No changes made to the field value [% value FILTER html %]. + No changes made to the field value [% value_old FILTER html %]. [% END %] [% ELSIF message_tag == "flag_cleared" %] diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c1fc9ae0d..c7b83e334 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -422,26 +422,17 @@ [% ELSIF error == "fieldname_invalid" %] [% title = "Specified Field Does Not Exist" %] - The field '[% field FILTER html %]' does not exist or + The field '[% field.name FILTER html %]' does not exist or cannot be edited with this interface. - [% ELSIF error == "fieldname_not_specified" %] - [% title = "Field Name Not Specified" %] - No field name specified when trying to edit field values. - [% ELSIF error == "fieldvalue_already_exists" %] [% title = "Field Value Already Exists" %] - The value '[% value FILTER html %]' already exists for the + The value '[% value.name FILTER html %]' already exists for the [%+ field.description FILTER html %] field. - [% ELSIF error == "fieldvalue_doesnt_exist" %] - [% title = "Specified Field Value Does Not Exist" %] - The value '[% value FILTER html %]' does not exist for - the '[% field FILTER html %]' field. - [% ELSIF error == "fieldvalue_is_default" %] [% title = "Specified Field Value Is Default" %] - '[% value FILTER html %]' is the default value for + '[% value.name FILTER html %]' is the default value for the '[% field.description FILTER html %]' field and cannot be deleted. [% IF user.in_group('tweakparams') %] You have to