From 1a9927c0c012c6c2dcc82552d0e397c992599754 Mon Sep 17 00:00:00 2001
From: "ghendricks%novell.com" <>
Date: Mon, 1 Jun 2009 14:43:12 +0000
Subject:  Bug 494628 -  Crash when trying to file a bug in a closed product
 r=LpSolit patch by ghendricks@novell.com

---
 Bugzilla/User.pm                                              | 2 +-
 template/en/default/admin/components/confirm-delete.html.tmpl | 4 ++--
 template/en/default/bug/field.html.tmpl                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 58183a005..55be2cf9e 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -728,7 +728,7 @@ sub can_enter_product {
         ThrowUserError('entry_access_denied', {product => $product_name});
     }
     # It could be closed for bug entry...
-    elsif ($product->disallow_new) {
+    elsif (!$product->is_active) {
         ThrowUserError('product_disabled', {product => $product});
     }
     # It could have no components...
diff --git a/template/en/default/admin/components/confirm-delete.html.tmpl b/template/en/default/admin/components/confirm-delete.html.tmpl
index 53bba1e35..d0a1385f1 100644
--- a/template/en/default/admin/components/confirm-delete.html.tmpl
+++ b/template/en/default/admin/components/confirm-delete.html.tmpl
@@ -82,8 +82,8 @@ from '[% product.name FILTER html %]' product
 
 </tr>
 <tr>
-  <TD VALIGN="top">Closed for [% terms.bugs %]:</TD>
-  <TD VALIGN="top">[% IF product.disallow_new %]Yes[% ELSE %]No[% END %]</td>
+  <TD VALIGN="top">Open for [% terms.bugs %]:</TD>
+  <TD VALIGN="top">[% IF product.is_active %]Yes[% ELSE %]No[% END %]</td>
 </tr>
 <tr>
   <td valign="top">[% terms.Bugs %]:</td>
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 68cc82a77..1d5a194e2 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -140,7 +140,7 @@
                 selected="selected"
               [% ELSIF (control_field && control_value
                         && !bug.${control_field.name}.contains(control_value.name))
-                       || (field.name == "product" && legal_value.disallow_new)
+                       || (field.name == "product" && !legal_value.is_active)
               %]
                 class="bz_hidden_option" disabled="disabled"
               [% END %]>
-- 
cgit v1.2.3-24-g4f1b