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

Addressbook - fix organisation view still showed all contacts

Browse Source
This commit is contained in:
nathangray 2017-05-31 10:18:34 -06:00
parent 5fb5a905e8
commit 77a285bbea
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1670,7 +1670,10 @@ window.egw_LAB.wait(function() {
{ {
list($name,$value) = explode(':',$part,2); list($name,$value) = explode(':',$part,2);
// do NOT set invalid column, as this gives an SQL error ("AND AND" in sql) // do NOT set invalid column, as this gives an SQL error ("AND AND" in sql)
if (static::$duplicate_fields[$name] && in_array($name, $fields) && $value) if (static::$duplicate_fields[$name] && $value && (
strpos($query['grouped_view'], 'duplicate:') === 0 && in_array($name, $fields) ||
strpos($query['grouped_view'], 'duplicate:') !== 0
))
{ {
$query['col_filter'][$name] = $value; $query['col_filter'][$name] = $value;
} }