Bug 308253: Ability to add select (enum) fields to a bug whose list of values depends on the value of another field

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bbaetz, a=mkanat

3 files changed, 63 insertions, 2 deletions

diff --git a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
index 2389fb6ae..b215edf04 100644
--- a/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
+++ b/template/en/default/admin/fieldvalues/confirm-delete.html.tmpl
@@ -62,7 +62,8 @@
 <h2>Confirmation</h2>
 
 [% IF value.is_default || value.bug_count || (value_count == 1)
-      || value.controls_visibility_of_fields.size 
+      || value.controls_visibility_of_fields.size
+      || value.controlled_values.size 
 %]
 
   <p>Sorry, but the '[% value.name FILTER html %]' value cannot be deleted
@@ -121,6 +122,20 @@
         [% END %]
       </li>
     [% END %]
+
+    [% IF value.controlled_values.size %]
+      <li>This value controls the visibility of the following values in
+        other fields:<br>
+       [% FOREACH controlled = value.controlled_values %]
+         <a href="editvalues.cgi?action=edit&field=
+                  [%- controlled.field.name FILTER url_quote %]&value=
+                  [%- controlled.name FILTER url_quote %]">
+           [% controlled.field.description FILTER html %]
+           ([% controlled.field.name FILTER html %]):
+           [%+ controlled.name FILTER html %]</a><br>
+       [% END %]
+      </li>
+    [% END %]
   </ul>
 
 [% ELSE %]
diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl
index bd6c427e6..f1eec1a5a 100644
--- a/template/en/default/admin/fieldvalues/create.html.tmpl
+++ b/template/en/default/admin/fieldvalues/create.html.tmpl
@@ -62,6 +62,27 @@
         </td>
       </tr>
     [% END %]
+    [% IF field.value_field %]
+      <tr>
+        <th align="right">
+          <label for="visibility_value_id">Only appears when 
+           [%+ field.value_field.description FILTER html %] is set to:
+          </label>
+        </th>
+        <td>
+          <select name="visibility_value_id" id="visibility_value_id">
+            <option></option>
+            [% FOREACH field_value = field.value_field.legal_values %]
+              [% NEXT IF field_value.name == '' %]
+              <option value="[% field_value.id FILTER none %]">
+                [%- field_value.name FILTER html -%]
+              </option>
+            [% END %]
+          </select>
+          <small>(Leave unset to have this value always appear.)</small>
+        </td>
+      </tr>
+    [% END %]
   </table>
   <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index f12383866..b01415577 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -32,7 +32,9 @@
   <table border="0" cellpadding="4" cellspacing="0">
 
     <tr>
-      <th valign="top"><label for="value_new">Field Value:</label></th>
+      <th valign="top" align="right">
+        <label for="value_new">Field Value:</label>
+      </th>
       <td>
         [% IF value.is_static %]
           <input type="hidden" name="value_new" id="value_new"
@@ -56,6 +58,29 @@
         <td>[% IF value.is_open %]Open[% ELSE %]Closed[% END %]</td>
       </tr>
     [% END %]
+    [% IF field.value_field %]
+      <tr>
+        <th align="right">
+          <label for="visibility_value_id">Only appears when
+           [%+ field.value_field.description FILTER html %] is set to:
+          </label>
+        </th>
+        <td>
+          <select name="visibility_value_id" id="visibility_value_id">
+            <option></option>
+            [% FOREACH field_value = field.value_field.legal_values %]
+              [% NEXT IF field_value.name == '' %]
+              <option value="[% field_value.id FILTER none %]"
+               [% ' selected="selected"' 
+                  IF field_value.id == value.visibility_value.id %]>
+                [%- field_value.name FILTER html -%]
+              </option>
+            [% END %]
+          </select>
+          <small>(Leave unset to have this value always appear.)</small>
+        </td>
+      </tr>
+    [% END %]
   </table>
 
   <input type="hidden" name="value" value="[% value.name FILTER html %]">