aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Tyson <mtyson@redhat.com>2013-02-17 02:18:02 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2013-02-17 02:18:02 +0100
commit1f49804084074be5bf37b1c588e2efce0c832b47 (patch)
treefacda9d583a27f2bfd97babf2481e0cc14239ae9
parentBug 825758: Most Bugzilla::BugUrl::* modules incorrectly validate the domain ... (diff)
downloadbugzilla-1f49804084074be5bf37b1c588e2efce0c832b47.tar.gz
bugzilla-1f49804084074be5bf37b1c588e2efce0c832b47.tar.bz2
bugzilla-1f49804084074be5bf37b1c588e2efce0c832b47.zip
Bug 839950: Cannot search by Change History on multi-select fields
r/a=LpSolit
-rw-r--r--Bugzilla/Bug.pm8
1 files changed, 6 insertions, 2 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 7d122d7ee..817bdf3f6 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3740,9 +3740,13 @@ sub bug_alias_to_id {
# Subroutines
#####################################################################
-# Represents which fields from the bugs table are handled by process_bug.cgi.
+# Returns a list of currently active and editable bug fields,
+# including multi-select fields.
sub editable_bug_fields {
my @fields = Bugzilla->dbh->bz_table_columns('bugs');
+ # Add multi-select fields
+ push(@fields, map { $_->name } @{Bugzilla->fields({obsolete => 0,
+ type => FIELD_TYPE_MULTI_SELECT})});
# Obsolete custom fields are not editable.
my @obsolete_fields = @{ Bugzilla->fields({obsolete => 1, custom => 1}) };
@obsolete_fields = map { $_->name } @obsolete_fields;
@@ -3750,7 +3754,7 @@ sub editable_bug_fields {
"lastdiffed", @obsolete_fields)
{
my $location = firstidx { $_ eq $remove } @fields;
- # Custom multi-select fields are not stored in the bugs table.
+ # Ensure field exists before attempting to remove it.
splice(@fields, $location, 1) if ($location > -1);
}
# Sorted because the old @::log_columns variable, which this replaces,