Bug 494628 - Crash when trying to file a bug in a closed product r=LpSolit patch...

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index 58183a005069c5c959fe9cfbbefed4779a3443f6..55be2cf9e63736de1a029ad702a8d22d2d99c06d 100644 (file)
--- 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 53bba1e357253b8cc840b11f0faa9530df6b36e4..d0a1385f18e7c76a67d9c0c609dec00975a33f19 100644 (file)
--- 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 68cc82a77d7ff65436667a3836d2454adf40073f..1d5a194e2bc140f697d5fcf3a2309afe920e7431 100644 (file)
--- 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 %]>