From: mkanat%kerio.com <>
Date: Tue, 12 Apr 2005 08:27:57 +0000 (+0000)
Subject: Bug 285533: Bugzilla displays inactive enum values
X-Git-Tag: bugzilla-2.19.3~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=683e10636b80dcf6b9e30fb6c41a64cc5620983d;p=thirdparty%2Fbugzilla.git

Bug 285533: Bugzilla displays inactive enum values
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=wicked, a=justdave
---

diff --git a/checksetup.pl b/checksetup.pl
index fe30711a4c..8e076426da 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -1756,8 +1756,8 @@ sub PopulateEnumTable ($@) {
 @my_severities = ('blocker','critical','major','normal','minor',
                  'trivial','enhancement') if !@my_severities;
 @my_priorities = ("P1","P2","P3","P4","P5") if !@my_priorities;
-@my_opsys = ("---","All","Windows","Mac OS","Linux","Other") if !@my_opsys;
-@my_platforms = ("---","All","PC","Macintosh","Other") if !@my_platforms;
+@my_opsys = ("All","Windows","Mac OS","Linux","Other") if !@my_opsys;
+@my_platforms = ("All","PC","Macintosh","Other") if !@my_platforms;
 
 PopulateEnumTable('bug_severity', @my_severities);
 PopulateEnumTable('priority', @my_priorities);
diff --git a/globals.pl b/globals.pl
index ec8c52d4d4..a9c3a36ce4 100644
--- a/globals.pl
+++ b/globals.pl
@@ -962,7 +962,9 @@ sub get_legal_field_values {
     my ($field) = @_;
     my $dbh = Bugzilla->dbh;
     my $result_ref = $dbh->selectcol_arrayref(
-                           "SELECT value FROM $field ORDER BY sortkey, value");
+         "SELECT value FROM $field
+           WHERE isactive = ?
+        ORDER BY sortkey, value", undef, (1));
     return @$result_ref;
 }