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

* Addressbook: fix problem regarding deleted entries found in org_view, when type filter is set to all

Browse Source
This commit is contained in:
Klaus Leithoff 2013-02-21 16:04:15 +00:00
parent 811ea4bd1a
commit dfa8e97fb6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addressbook/inc/class.addressbook_so.inc.php
View File

@ -620,7 +620,6 @@ class addressbook_so
{
unset($filter['tid']); // return all entries incl. deleted
}
$backend = $this->get_backend(null,$filter['owner']);
// single string to search for --> create so_sql conformant search criterial for the standard search columns
if ($criteria && !is_array($criteria))
@ -738,6 +737,15 @@ class addressbook_so
{
$param['search'] = $this->data2db($param['search']);
}
if(!array_key_exists('tid', $param['col_filter']) || $param['col_filter']['tid'] === '')
{
$param['col_filter'][] = 'contact_tid != \'' . self::DELETED_TYPE . '\'';
}
elseif(is_null($param['col_filter']['tid']))
{
unset($param['col_filter']['tid']); // return all entries incl. deleted
}
$rows = $this->somain->organisations($param);
$this->total = $this->somain->total;
//echo "<p>socontacts::organisations(".print_r($param,true).")<br />".$this->somain->db->Query_ID->sql."</p>\n";

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

@ -1667,7 +1667,7 @@ class addressbook_ui extends addressbook_bo
egw_link::link('addressbook',$content['id'],$links);
}
$content['js'] = "opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']}); if(opener.egw_getAppName() != 'addressbook') { opener.egw_refresh('".str_replace("'","\\'",$content['msg'])."','addressbook',{$content['id']},null,'addressbook');}";
error_log($GLOBALS['egw_info']['flags']['currentapp']);
if ($button == 'save')
{
$content['js'] .= ' window.close();';