summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%kerio.com <>2005-04-12 10:27:57 +0200
committermkanat%kerio.com <>2005-04-12 10:27:57 +0200
commit683e10636b80dcf6b9e30fb6c41a64cc5620983d (patch)
treeff8d50ae319f5832477b071571a2fc365cfb30ae
parent531a3a34b85bd3c6284733869046270cc2d5300e (diff)
downloadbugzilla-683e10636b80dcf6b9e30fb6c41a64cc5620983d.tar.gz
bugzilla-683e10636b80dcf6b9e30fb6c41a64cc5620983d.tar.xz
Bug 285533: Bugzilla displays inactive enum values
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=wicked, a=justdave
-rwxr-xr-xchecksetup.pl4
-rw-r--r--globals.pl4
2 files changed, 5 insertions, 3 deletions
diff --git a/checksetup.pl b/checksetup.pl
index fe30711a4..8e076426d 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 ec8c52d4d..a9c3a36ce 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;
}