mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-09 06:51:14 +01:00
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.
This commit is contained in:
parent
2b2b88c35c
commit
d3165294c6
@ -681,6 +681,12 @@ class uicontacts extends bocontacts
|
||||
{
|
||||
$do_email = $query['do_email'];
|
||||
$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 (is_array($query['search'])) unset($query['search']);
|
||||
|
Loading…
Reference in New Issue
Block a user