From 30b683cf5a2edcb2a34761b9720ade8cb5675506 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 1 Mar 2010 10:22:43 +0000 Subject: [PATCH] fixing of an orgview bug: orgview was extremly sticky, after you selected an org member for e.g. infolog view --- addressbook/inc/class.addressbook_ui.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 3fb0538cd5..17f23a063e 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -332,6 +332,13 @@ class addressbook_ui extends addressbook_bo $org_name = implode(': ',$org_name); $sel_options['org_view'][(string) $content['nm']['org_view']] = $org_name; } + // unset the filters regarding organisations, when there is no organisation selected + if (empty($sel_options['org_view'][(string) $content['nm']['org_view']]) || stripos($org_view,":") === false ) + { + unset($content['nm']['col_filter']['org_name']); + unset($content['nm']['col_filter']['org_unit']); + unset($content['nm']['col_filter']['adr_one_locality']); + } $content['nm']['org_view_label'] = $sel_options['org_view'][(string) $content['nm']['org_view']]; $this->tmpl->read(/*$do_email ? 'addressbook.email' :*/ 'addressbook.index');