From e39a1db4115cfd721fa65c746e7699e79cda87ae Mon Sep 17 00:00:00 2001
From: "ghendricks%novell.com" <>
Date: Wed, 20 May 2009 23:09:55 +0000
Subject:  Bug 493090 -  Product disallownew should be converted to isactive 
 patch by ghendricks r=mkanat a=mkanat

---
 .../en/default/admin/products/confirm-delete.html.tmpl  |  6 +++---
 template/en/default/admin/products/create.html.tmpl     |  1 +
 .../en/default/admin/products/edit-common.html.tmpl     |  7 +++----
 template/en/default/admin/products/list.html.tmpl       | 17 ++---------------
 template/en/default/admin/products/updated.html.tmpl    |  8 ++++----
 5 files changed, 13 insertions(+), 26 deletions(-)

(limited to 'template')

diff --git a/template/en/default/admin/products/confirm-delete.html.tmpl b/template/en/default/admin/products/confirm-delete.html.tmpl
index 516672142..d350bdb90 100644
--- a/template/en/default/admin/products/confirm-delete.html.tmpl
+++ b/template/en/default/admin/products/confirm-delete.html.tmpl
@@ -93,10 +93,10 @@
   <tr>
     <td>Closed for [% terms.bugs %]:</td>
     <td>
-      [% IF product.disallownew %]
-        closed
-      [% ELSE %]
+      [% IF product.is_active %]
         open
+      [% ELSE %]
+        closed
       [% END %]
     </td>
   </tr>
diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl
index 08da684c2..664564040 100644
--- a/template/en/default/admin/products/create.html.tmpl
+++ b/template/en/default/admin/products/create.html.tmpl
@@ -31,6 +31,7 @@
   product.votesperuser = "0",
   product.maxvotesperbug  = "10000",
   product.votestoconfirm = "0",
+  product.is_active = 1,
   version = "unspecified",
   product.defaultmilestone = constants.DEFAULT_MILESTONE
 %]
diff --git a/template/en/default/admin/products/edit-common.html.tmpl b/template/en/default/admin/products/edit-common.html.tmpl
index c05a87877..8b42592cb 100644
--- a/template/en/default/admin/products/edit-common.html.tmpl
+++ b/template/en/default/admin/products/edit-common.html.tmpl
@@ -70,10 +70,9 @@
 [% END %]
     
 <tr>
-  <th align="right">Closed for [% terms.bug %] entry:</th>
-  <td><input type="checkbox" name="disallownew" value="1"
-       [% IF product.disallownew == "1" %]
-             checked="checked"[% END %]>
+  <th align="right">Open for [% terms.bug %] entry:</th>
+  <td><input type="checkbox" name="is_active" value="1"
+       [% ' checked="checked"' IF product.is_active %]>
   </td>
 </tr>
 
diff --git a/template/en/default/admin/products/list.html.tmpl b/template/en/default/admin/products/list.html.tmpl
index b82a6a5b0..6fd5240af 100644
--- a/template/en/default/admin/products/list.html.tmpl
+++ b/template/en/default/admin/products/list.html.tmpl
@@ -60,8 +60,9 @@
        allow_html_content => 1
      },
      { 
-       name => "disallow_new"
+       name => "is_active"
        heading => "Open For New $terms.Bugs"
+       yesno_field => 1
      },
      { 
        name => "votesperuser"
@@ -99,20 +100,6 @@
      })
 %]
 
-[% overrides.disallow_new = [ {
-     match_value => "1"
-     match_field => 'disallow_new'
-     override_content => 1
-     content => "No"
-   },
-   {
-     match_value => 0
-     match_field => 'disallow_new'
-     override_content => 1
-     content => "Yes"
-   }]
-%] 
-
 [% PROCESS admin/table.html.tmpl
      columns = columns
      data = products
diff --git a/template/en/default/admin/products/updated.html.tmpl b/template/en/default/admin/products/updated.html.tmpl
index b04fa4663..f0e00f853 100644
--- a/template/en/default/admin/products/updated.html.tmpl
+++ b/template/en/default/admin/products/updated.html.tmpl
@@ -55,13 +55,13 @@
   <p style="margin: 1em 3em 1em 3em">[% product.description FILTER html_light %]</p>
 [% END %]
 
-[% IF changes.disallownew.defined %]
+[% IF changes.isactive.defined %]
   <p>
   Product is now
-  [% IF product.disallow_new %]
-    closed to
+  [% IF product.is_active %]
+    open for
   [% ELSE %]
-    open for 
+    closed to 
   [% END %]
   new [% terms.bugs %].
   </p>
-- 
cgit v1.2.3-24-g4f1b