extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix searching in duplicate contact list

Browse Source
This commit is contained in:
nathangray 2017-03-16 11:06:58 -06:00
parent 71de64fe8f
commit c65c081585
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Contacts/Sql.php
View File

@ -357,7 +357,12 @@ class Sql extends Api\Storage
$criteria = array(); $criteria = array();
if ($param['search'] && !is_array($param['search'])) if ($param['search'] && !is_array($param['search']))
{ {
$search = $this->search2criteria($param['search'],$wildcard,$op); $search_cols = array();
foreach($group as $col)
{
$search_cols[] = $this->table_name . '.' . $col;
}
$search = $this->search2criteria($param['search'],$wildcard,$op, null, $search_cols);
$criteria = array($search); $criteria = array($search);
} }
$query = $this->parse_search(array_merge($criteria, $filter), $wildcard, false, ' AND '); $query = $this->parse_search(array_merge($criteria, $filter), $wildcard, false, ' AND ');
@ -378,7 +383,7 @@ class Sql extends Api\Storage
$rows = $this->db->query( $rows = $this->db->query(
"SELECT " . $columns. ', COUNT(contact_id) AS group_count' . "SELECT " . $columns. ', COUNT(contact_id) AS group_count' .
' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) . ' FROM (' . $sub_query . ') AS matches GROUP BY ' . implode(',',$group) .
' ORDER BY ' . $order, ' HAVING group_count > 1 ORDER BY ' . $order,
__LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1 __LINE__, __FILE__, (int)$param['start'],$mysql_calc_rows ? (int)$param['num_rows'] : -1
); );
if ($mysql_calc_rows) if ($mysql_calc_rows)