holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filtering on a multi-select custom field. Any entry with the filter value will be included.

Browse Source
This commit is contained in:
Nathan Gray 2010-04-07 16:06:01 +00:00
parent cacaff872d
commit 97727d41ce
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/inc/class.so_sql_cf.inc.php
View File

@ -480,8 +480,21 @@ class so_sql_cf extends so_sql
}
else // using egw_db::expression to allow to use array() with possible values or NULL
{
$sql_filter = str_replace($this->extra_value,'extra_filter.'.
$this->extra_value,$this->db->expression($this->extra_table,array($this->extra_value => $val)));
if($this->customfields[$this->get_cf_name($name)]['type'] == 'select' &&
$this->customfields[$this->get_cf_name($name)]['rows'] > 1)
{
// Multi-select - any entry with the filter value selected matches
$sql_filter = str_replace($this->extra_value,'extra_filter.'.
$this->extra_value,$this->db->expression($this->extra_table,array(
"CONCAT(',',{$this->extra_value},',') LIKE '%,$val,%'"
))
);
}
else
{
$sql_filter = str_replace($this->extra_value,'extra_filter.'.
$this->extra_value,$this->db->expression($this->extra_table,array($this->extra_value => $val)));
}
}
// need to use a LEFT JOIN for negative search or to allow NULL values
$need_left_join = $val[0] === '!' || strpos($sql_filter,'IS NULL') !== false ? ' LEFT ' : '';