From 7072d6a673f9a05b688d07e05980b7932c7abbe6 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Fri, 14 May 2010 07:25:05 -0700
Subject: Bug 561296: A fix allowing updating a field value's name when it is
 the default value r=LpSolit, a=LpSolit

---
 template/en/default/admin/fieldvalues/edit.html.tmpl | 6 +++++-
 template/en/default/global/user-error.html.tmpl      | 9 +++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index fb58e5784..9c42ce639 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -94,7 +94,11 @@
            [% ELSIF value.is_static %]
              This value is non-deletable and cannot be disabled.
            [% END %]
-           </td>
+           [% IF !(value.is_default OR value.is_static) %]
+             <input id="defined_is_active" name="defined_is_active"
+                    type="hidden" value="1">
+           [% END %]
+      </td>
     </tr>
   </table>
   <input type="hidden" name="value" value="[% value.name FILTER html %]">
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 5fdcee8f3..279f29c71 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -521,7 +521,8 @@
   [% ELSIF error == "fieldvalue_is_default" %]
     [% title = "Specified Field Value Is Default" %]
     '[% value.name FILTER html %]' is the default value for
-    the '[% field.description FILTER html %]' field and cannot be deleted.
+    the '[% field.description FILTER html %]' field and cannot be deleted
+    or disabled.
     [% IF user.in_group('tweakparams') %]
       You have to <a href="editparams.cgi?section=bugfields#
       [%- param_name FILTER url_quote %]">change</a> the default value first.
@@ -541,9 +542,9 @@
 
   [% ELSIF error == "fieldvalue_not_deletable" %]
     [% title = "Field Value Not Deletable" %]
-    The value '[% value.name FILTER html %]' cannot be removed because
-    it plays some special role for the '[% field.description FILTER html %]' 
-    field.
+    The value '[% value.name FILTER html %]' cannot be removed or
+    disabled, because it plays some special role for the 
+    '[% field.description FILTER html %]' field.
 
   [% ELSIF error == "fieldvalue_reserved_word" %]
     [% title = "Reserved Word Not Allowed" %]
-- 
cgit v1.2.3-24-g4f1b