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 fe30711a4cbc8b35404f054ccb79c79e0651056d..8e076426da20605bb672fff989c07c5c97a81b23 100755 (executable)
--- 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 ec8c52d4d4336ba19d69c537a91087118054b1c0..a9c3a36ce4976db05683754179d69a0d294b6d02 100644 (file)
--- 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;
 }