Bug 456743 - Add the ability to disable field values (mark them as inactive)

 patch by ghendricks@novell.com r=LpSolit, a=LpSolit

4 files changed, 26 insertions, 8 deletions

diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index b01415577..5650ee87b 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -81,8 +81,19 @@
         </td>
       </tr>
     [% END %]
+    <tr>
+      <th align="right"><label for="is_active">Enabled for [% terms.bugs %]:</label></th>
+      <td><input id="is_active" name="is_active" type="checkbox" value="1" 
+           [%+ 'checked="checked"' IF value.is_active %]
+           [%+ 'disabled="disabled"' IF value.is_default OR value.is_static %]>
+           [% IF value.is_default %]
+             This value is selected as default in the parameters for this field. It cannot be disabled.
+           [% ELSIF value.is_static %]
+             This value is non-deletable and cannot be disabled.
+           [% END %]
+           </td>
+    </tr>
   </table>
-
   <input type="hidden" name="value" value="[% value.name FILTER html %]">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="field" value="[% field.name FILTER html %]">
diff --git a/template/en/default/admin/fieldvalues/list.html.tmpl b/template/en/default/admin/fieldvalues/list.html.tmpl
index fdc22d912..3f750ebca 100644
--- a/template/en/default/admin/fieldvalues/list.html.tmpl
+++ b/template/en/default/admin/fieldvalues/list.html.tmpl
@@ -51,6 +51,11 @@
        heading => "Sortkey"
      },
      {
+       name => "isactive"
+       heading => "Enabled for $terms.bugs"
+       yesno_field => 1
+     },
+     {
        name => "action"
        heading => "Action"
        content => "Delete"
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 21a73a805..039910f1d 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -142,7 +142,7 @@
                 selected="selected"
               [% ELSIF (control_field && control_value
                         && !bug.${control_field.name}.contains(control_value.name))
-                       || (field.name == "product" && !legal_value.is_active)
+                       || !legal_value.is_active
               %]
                 class="bz_hidden_option" disabled="disabled"
               [% END %]>
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 46df426c1..078ff8c6b 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -611,15 +611,17 @@ function doOnSelectProduct(selectmode) {
   <td align="left">
     <select name="[% sel.name %]" id="[% sel.name %]"
             multiple="multiple" size="[% sel.size %]">
-      [% FOREACH name = ${sel.name} %]
-        <option value="[% name FILTER html %]"
-          [% " selected" IF lsearch(default.${sel.name}, name) != -1 %]>
+      [% FOREACH value = ${sel.name} %]
+      [%# This only applies for Resolution really %]
+        <option value="[% value.name OR '---' FILTER html %]"
+          [% " selected" IF lsearch(default.${sel.name}, value.name) != -1 %]>
           [% IF sel.name == "bug_status" %]
-            [% get_status(name) FILTER html %]
+            [% get_status(value.name) FILTER html %]
           [% ELSIF sel.name == "resolution" %]
-            [% get_resolution(name) FILTER html %]
+            [%# Again, resolution has that odd empty value. Replace it with '---' %]
+            [% get_resolution(value.name) OR '---' FILTER html %]
           [% ELSE %]
-            [% name FILTER html %]
+            [% value.name FILTER html %]
           [% END %]
         </option>
       [% END %]