Bug 77193 - Add the ability to retire (disable) old versions, components and milestones

r/a=mkanat

11 files changed, 57 insertions, 11 deletions

diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index e2caa5208..da934f420 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -83,7 +83,7 @@ from '[% product.name FILTER html %]' product
 </tr>
 <tr>
   <TD VALIGN="top">Open for [% terms.bugs %]:</TD>
-  <TD VALIGN="top">[% IF product.is_active %]Yes[% ELSE %]No[% END %]</td>
+  <TD VALIGN="top">[% IF product.is_active && comp.isactive %]Yes[% ELSE %]No[% END %]</td>
 </tr>
 <tr>
   <td valign="top">[% terms.Bugs %]:</td>
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index e34e18d0c..b5fc3c321 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -43,6 +43,11 @@
     [% PROCESS "admin/components/edit-common.html.tmpl" %]
 
     <tr>
+      <td><label for="isactive">Enabled For [% terms.Bugs %]:</label></td>
+      <td><input id="isactive" name="isactive" type="checkbox" value="1" 
+                 [% 'checked="checked"' IF comp.isactive %]></td>
+    </tr>
+    <tr>
       <td>[% terms.Bugs %]:</td>
       <td>
 [% IF comp.bug_count > 0 %]
diff --git a/template/en/default/admin/components/list.html.tmpl b/template/en/default/admin/components/list.html.tmpl
index b62ce1bae..b45b97565 100644
--- a/template/en/default/admin/components/list.html.tmpl
+++ b/template/en/default/admin/components/list.html.tmpl
@@ -56,6 +56,11 @@
        name => "initialowner"
        heading => "Default Assignee"
      },
+     {
+       name => "isactive"
+       heading => "Active"
+       yesno_field => 1
+     },
    ]
 %]
 
diff --git a/template/en/default/admin/milestones/edit.html.tmpl b/template/en/default/admin/milestones/edit.html.tmpl
index dfe9d1bd8..6a2be869e 100644
--- a/template/en/default/admin/milestones/edit.html.tmpl
+++ b/template/en/default/admin/milestones/edit.html.tmpl
@@ -47,7 +47,11 @@
       <td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
       [%- milestone.sortkey FILTER html %]"></td>
     </tr>
-
+    <tr>
+      <th><label for="isactive">Enabled For [% terms.Bugs %]:</label></th>
+      <td><input id="isactive" name="isactive" type="checkbox" value="1"
+                 [% 'checked="checked"' IF milestone.isactive %]></td>
+    </tr>
   </table>
 
   <input type="hidden" name="milestoneold" value="[% milestone.name FILTER html %]">
diff --git a/template/en/default/admin/milestones/list.html.tmpl b/template/en/default/admin/milestones/list.html.tmpl
index 56f621e1e..6392f567f 100644
--- a/template/en/default/admin/milestones/list.html.tmpl
+++ b/template/en/default/admin/milestones/list.html.tmpl
@@ -53,6 +53,11 @@
      { 
        name => "sortkey"
        heading => "Sortkey"
+     },
+     {
+       name => "isactive"
+       heading => "Active"
+       yesno_field => 1
      }
    ]
 %]
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
index 2a7c78423..1de233567 100644
--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -41,7 +41,11 @@
       <td><input id="version" size="64" maxlength="64" name="version" value="
       [%- version.name FILTER html %]"></td>
     </tr>
-
+    <tr>
+      <th><label for="isactive">Enabled For [% terms.Bugs %]:</label></th>
+      <td><input id="isactive" name="isactive" type="checkbox" value="1"
+                 [% 'checked="checked"' IF version.isactive %]></td>
+    </tr>
   </table>
 
   <input type="hidden" name="versionold" value="[% version.name FILTER html %]">
diff --git a/template/en/default/admin/versions/list.html.tmpl b/template/en/default/admin/versions/list.html.tmpl
index ae21bbf5c..69435d220 100644
--- a/template/en/default/admin/versions/list.html.tmpl
+++ b/template/en/default/admin/versions/list.html.tmpl
@@ -45,6 +45,11 @@
        name => "name"
        heading => "Edit version..."
        contentlink => edit_contentlink
+     },
+     {
+       name => "isactive"
+       heading => "Active"
+       yesno_field => 1
      }
    ]
 %]
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 08eb44c4e..ebb222850 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -238,6 +238,7 @@ TUI_hide_default('attachment_text_field');
         [% END %]
 
         [%- FOREACH c = product.components %]
+          [% NEXT IF NOT c.is_active %]
           <option value="[% c.name FILTER html %]"
                   id="v[% c.id FILTER html %]_component"
             [% IF c.name == default.component_ %]
@@ -288,8 +289,9 @@ TUI_hide_default('attachment_text_field');
     <td rowspan="3">
       <select name="version" id="version" size="5">
         [%- FOREACH v = version %]
-          <option value="[% v FILTER html %]"
-            [% ' selected="selected"' IF v == default.version %]>[% v FILTER html -%]
+          [% NEXT IF NOT v.is_active %]
+          <option value="[% v.name FILTER html %]"
+            [% ' selected="selected"' IF v.name == default.version %]>[% v.name FILTER html -%]
           </option>
         [%- END %]
       </select>
@@ -733,9 +735,10 @@ TUI_hide_default('attachment_text_field');
     <select name="[% field.name FILTER html %]" 
             id="[% field.name FILTER html %]">
     [%- FOREACH x = ${field.name} %]
-      <option value="[% x FILTER html %]"
-        [% " selected=\"selected\"" IF x == default.${field.name} %]>
-        [% display_value(field.name, x) FILTER html %]
+      [% NEXT IF NOT x.is_active %]
+      <option value="[% x.name FILTER html %]"
+        [% " selected=\"selected\"" IF x.name == default.${field.name} %]>
+        [% display_value(field.name, x.name) FILTER html %]
       </option>
     [% END %]
     </select>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 0a558ecc1..4b5e7769e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -1117,6 +1117,7 @@
           AND bug.choices.${selname}.size > 1 %]
       <select id="[% selname %]" name="[% selname %]">
         [% FOREACH x = bug.choices.${selname} %]
+          [% NEXT IF NOT x.is_active AND x.name != bug.${selname} %]
           <option value="[% x.name FILTER html %]"
             [% " selected" IF x.name == bug.${selname} %]>
             [%- x.name FILTER html %]
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 34347b21c..4065b3af0 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -124,6 +124,7 @@
             [% legal_values = field.legal_values %]
           [% END %]
           [% FOREACH legal_value = legal_values %]
+            [% NEXT IF NOT legal_value.is_active AND NOT value.contains(legal_value.name).size %]
             <option value="[% legal_value.name FILTER html %]"
                     id="v[% legal_value.id FILTER html %]_
                         [%- field.name FILTER html %]"
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 85c2ed513..8747c56bf 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -234,6 +234,9 @@
           <li>Default CC list deleted</li>
         [% END %]
       [% END %]
+      [% IF changes.isactive.defined %]
+        <li>[% comp.is_active ? "Enabled" : "Disabled" %] for [% terms.bugs %]</li>
+      [% END %]
       [% Hook.process('component_updated_fields') %]
       </ul>
     [% ELSE %]
@@ -547,6 +550,9 @@
         [% IF changes.sortkey.defined %]
           <li>Sortkey updated to <em>[% milestone.sortkey FILTER html %]</em>
         [% END %]
+        [% IF changes.isactive.defined %]
+          <li>[% milestone.is_active ? "Enabled" : "Disabled" %] for [% terms.bugs %]</li>
+        [% END %]
       </ul>
     [% ELSE %]
       No changes made to milestone <em>[% milestone.name FILTER html %]</em>.
@@ -831,9 +837,16 @@
   [% ELSIF message_tag == "version_updated" %]
     [% title = "Version Updated" %]
     [% IF changes.size %]
-      [% IF changes.value.defined %]
-        Version renamed to <em>[% version.name FILTER html %]</em>.
-      [% END %]
+      Changes to the version <em>[% version.name FILTER html %]</em>
+      have been saved:
+      <ul>
+        [% IF changes.value.defined %]
+          <li>Version renamed to <em>[% version.name FILTER html %]</em></li>
+        [% END %]
+        [% IF changes.isactive.defined %]
+          <li>[% version.is_active ? "Enabled" : "Disabled" %] for [% terms.bugs %]</li>
+        [% END %]
+      </ul>
     [% ELSE %]
       No changes made to version <em>[% version.name FILTER html %]</em>.
     [% END %]