extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 08:34:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

support CFs for multiple types in the type-filter

Browse Source
This commit is contained in:
ralf 2024-10-15 11:53:20 +02:00
parent 93c4f397b3
commit 7cb135c43e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/inc/class.admin_customfields.inc.php
View File

@ -67,6 +67,15 @@ class admin_customfields
*/ */
protected $content_type = null; protected $content_type = null;
/**
* @var Api\Storage\Base
*/
protected $so;
/**
* @var Api\Db
*/
protected $db;
var $public_functions = array( var $public_functions = array(
'index' => true, 'index' => true,
'edit' => True 'edit' => True
@ -124,6 +133,7 @@ class admin_customfields
$this->content_types = Api\Config::get_content_types($this->appname); $this->content_types = Api\Config::get_content_types($this->appname);
} }
$this->so = new Api\Storage\Base('api','egw_customfields',null,'',true); $this->so = new Api\Storage\Base('api','egw_customfields',null,'',true);
$this->db = $GLOBALS['egw']->db;
// Make sure app css & lang get loaded, extending app might cause et2 to miss it // Make sure app css & lang get loaded, extending app might cause et2 to miss it
Framework::includeCSS('admin','app'); Framework::includeCSS('admin','app');
@ -764,7 +774,7 @@ class admin_customfields
} }
else else
{ {
$query['col_filter'][0] = '(cf_type2 IS NULL OR cf_type2='.$GLOBALS['egw']->db->quote($t2).')'; $query['col_filter'][0] = '(cf_type2 IS NULL OR '.$this->db->concat("','", 'cf_type2', "','").' LIKE '.$GLOBALS['egw']->db->quote('%,'.$t2.',%').')';
} }
unset($query['col_filter']['cf_type2']); unset($query['col_filter']['cf_type2']);
} }