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

* All apps/custom fields: fixed multiple identical rows, if custom fields where set (introduced in last package)

Browse Source
This commit is contained in:
Ralf Becker 2013-07-23 07:58:51 +00:00
parent c0d040342b
commit dbd43126c8
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etemplate/inc/class.so_sql.inc.php
View File

@ -823,6 +823,7 @@ class so_sql
*/
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{
//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
// if extending class or instanciator set columns to search, convert string criteria to array

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

@ -414,6 +414,7 @@ class so_sql_cf extends so_sql
*/
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
{
//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
if ($only_keys === false)
{
$only_keys = $this->table_name.'.*';
@ -500,6 +501,13 @@ class so_sql_cf extends so_sql
$col = $this->table_name .'.'.array_search($col, $this->db_cols).' AS '.$col;
}
}
// add DISTINCT as by joining custom fields for search a row can be returned multiple times
$only_keys = array_values($only_keys);
$only_keys[0] = 'DISTINCT '.$only_keys[0];
}
else
{
$only_keys = 'DISTINCT '.$only_keys;
}
// check if we order by a custom field --> join cf table for given cf and order by it's value
if (strpos($order_by,self::CF_PREFIX) !== false)