extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

attempt to fix the problem with the stick org_view problem in addressbook. col_filter is not reseted if org_view criteria is set to all.

Browse Source
This commit is contained in:
Klaus Leithoff 2008-03-10 12:15:47 +00:00
parent 123777682e
commit 2ec1a77daf
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.uicontacts.inc.php
View File

@ -718,6 +718,12 @@ class uicontacts extends bocontacts
} else { } else {
$old_state = $GLOBALS['egw']->session->appsession($do_email ? 'email' : 'index','addressbook'); $old_state = $GLOBALS['egw']->session->appsession($do_email ? 'email' : 'index','addressbook');
} }
if (!isset($this->org_views[(string) $query['org_view']])) // we dont have an org view, unset the according col_filters
{
if (isset($query['col_filter']['org_name'])) unset($query['col_filter']['org_name']);
if (isset($query['col_filter']['adr_one_locality'])) unset($query['col_filter']['adr_one_locality']);
if (isset($query['col_filter']['org_unit'])) unset($query['col_filter']['org_unit']);
}
if (isset($this->org_views[(string) $query['org_view']])) // we have an org view, reset the advanced search if (isset($this->org_views[(string) $query['org_view']])) // we have an org view, reset the advanced search
{ {