From f73943ea8d2a00c1d54486c1d4af2102a6d749d3 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 3 Feb 2014 20:13:52 +0000 Subject: [PATCH] Update actions when changing between contact & org list --- addressbook/inc/class.addressbook_ui.inc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 227b1d0e94..d4a8a1e657 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1261,6 +1261,11 @@ window.egw_LAB.wait(function() { if (isset($this->org_views[(string) $query['org_view']])) // we have an org view { + if($query['actions'] && $query['actions']['edit']) + { + // Just switched from contact view, update actions + $query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']); + } unset($query['col_filter']['list']); // does not work together $query['no_filter2'] = true; // switch the distribution list selection off @@ -1309,6 +1314,11 @@ window.egw_LAB.wait(function() { $query['col_filter'][$name] = $value; } } + else if($query['actions'] && !$query['actions']['edit']) + { + // Just switched from org view, update actions + $query['actions'] = $this->get_actions($query['col_filter']['tid'], $query['org_view']); + } // translate the select order to the really used over all 3 columns $sort = $query['sort']; switch($query['order']) // "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end