summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Install/DB.pm2
-rw-r--r--Bugzilla/Search.pm20
2 files changed, 20 insertions, 2 deletions
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 28f91a23c..1a3ffc69b 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -105,6 +105,8 @@ sub update_fielddefs_definition {
#2008-08-26 elliotte_martin@yahoo.com - Bug 251556
$dbh->bz_add_column('fielddefs', 'reverse_desc', {TYPE => 'TINYTEXT'});
+ $dbh->do('UPDATE fielddefs SET buglist = 1
+ WHERE custom = 1 AND type = ' . FIELD_TYPE_MULTI_SELECT);
# Remember, this is not the function for adding general table changes.
# That is below. Add new changes to the fielddefs table above this
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 2c36fe233..76c4cd950 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -162,8 +162,18 @@ sub COLUMNS {
foreach my $field (Bugzilla->get_fields({ obsolete => 0, buglist => 1 })) {
my $id = $field->name;
$id = $old_names{$id} if exists $old_names{$id};
- my $sql = 'bugs.' . $field->name;
- $sql = $special_sql{$id} if exists $special_sql{$id};
+ my $sql;
+ if (exists $special_sql{$id}) {
+ $sql = $special_sql{$id};
+ }
+ elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+ $sql = $dbh->sql_group_concat(
+ 'DISTINCT map_bug_' . $field->name . '.value',
+ $dbh->quote(', '));
+ }
+ else {
+ $sql = 'bugs.' . $field->name;
+ }
$columns{$id} = { name => $sql, title => $field->description };
}
@@ -273,6 +283,12 @@ sub init {
push(@supptables, "LEFT JOIN longdescs AS ldtime " .
"ON ldtime.bug_id = bugs.bug_id");
}
+ foreach my $field (@multi_select_fields) {
+ my $field_name = $field->name;
+ next if !grep($_ eq $field_name, @fields);
+ push(@supptables, "LEFT JOIN bug_$field_name AS map_bug_$field_name"
+ . " ON map_bug_$field_name.bug_id = bugs.bug_id");
+ }
if (grep($_ eq 'flagtypes.name', @fields)) {
push(@supptables, "LEFT JOIN flags ON flags.bug_id = bugs.bug_id AND attach_id IS NULL");