extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-05 05:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update actions when changing between contact & org list

Browse Source
This commit is contained in:
Nathan Gray 2014-02-03 20:13:52 +00:00
parent c4a01a3de9
commit f73943ea8d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,6 +1261,11 @@ window.egw_LAB.wait(function() {
if (isset($this->org_views[(string) $query['org_view']])) // we have an org view 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 unset($query['col_filter']['list']); // does not work together
$query['no_filter2'] = true; // switch the distribution list selection off $query['no_filter2'] = true; // switch the distribution list selection off
@ -1309,6 +1314,11 @@ window.egw_LAB.wait(function() {
$query['col_filter'][$name] = $value; $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 // translate the select order to the really used over all 3 columns
$sort = $query['sort']; $sort = $query['sort'];
switch($query['order']) // "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end switch($query['order']) // "xxx<>'' DESC" sorts contacts with empty order-criteria always at the end