extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fixed not returned id's if only_keys==true"

Browse Source
This commit is contained in:
Ralf Becker 2007-05-25 17:33:26 +00:00
parent 1e9b08d510
commit 889a5c01c6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/inc/class.socontacts_sql.inc.php
View File

@ -145,7 +145,10 @@ class socontacts_sql extends so_sql
else // by adr_one_location or org_unit else // by adr_one_location or org_unit
{ {
// org total for more then one $by // org total for more then one $by
$append = "GROUP BY org_name HAVING {$by}_count > 1 ORDER BY org_name $sort"; $by_expr = $by == 'org_unit_count' ? "COUNT(DISTINCT CASE WHEN org_unit IS NULL THEN '' ELSE org_unit END)" :
"COUNT(DISTINCT CASE WHEN adr_one_locality IS NULL THEN '' ELSE adr_one_locality END)";
// $append = "GROUP BY org_name HAVING {$by}_count > 1 ORDER BY org_name $sort";
$append = "GROUP BY org_name HAVING $by_expr > 1 ORDER BY org_name $sort";
parent::search($param['search'],array('org_name'),$append,array( parent::search($param['search'],array('org_name'),$append,array(
"NULL AS $by", "NULL AS $by",
'COUNT(org_name) AS org_count', 'COUNT(org_name) AS org_count',
@ -292,7 +295,7 @@ class socontacts_sql extends so_sql
case 'boolean': case 'boolean':
// only return the egw_addressbook columns, to not generate dublicates by the left join // only return the egw_addressbook columns, to not generate dublicates by the left join
// and to not return the NULL for contact_{id|owner} of not found custom fields! // and to not return the NULL for contact_{id|owner} of not found custom fields!
$only_keys = 'DISTINCT '.$this->table_name.'.'.($only_keys ? 'contact_id' : '*'); $only_keys = 'DISTINCT '.$this->table_name.'.'.($only_keys ? 'contact_id AS contact_id' : '*');
break; break;
case 'string': case 'string':
$only_keys = explode(',',$only_keys); $only_keys = explode(',',$only_keys);