fix contacts show organisation actions too

This commit is contained in:
Ralf Becker 2015-04-24 15:13:45 +00:00
parent 464b933e38
commit 62f541cce6

View File

@ -424,7 +424,7 @@ class addressbook_ui extends addressbook_bo
); );
} }
} }
// org view // org view
$actions += array( $actions += array(
'view_org' => array( 'view_org' => array(
@ -1414,7 +1414,7 @@ window.egw_LAB.wait(function() {
{ {
// Query doesn't like empties // Query doesn't like empties
unset($query['col_filter']['parent_id']); unset($query['col_filter']['parent_id']);
if($query['actions'] && $query['actions']['open']) if($query['actions'] && $query['actions']['open'])
{ {
// Just switched from contact view, update actions // Just switched from contact view, update actions
@ -1643,7 +1643,7 @@ window.egw_LAB.wait(function() {
} }
if (!$row['owner']) if (!$row['owner'])
{ {
$row['class'] .= 'rowAccount rowNoDelete'; $row['class'] .= 'rowAccount rowNoDelete ';
} }
elseif (!$this->check_perms(EGW_ACL_DELETE,$row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == addressbook_so::DELETED_TYPE)) elseif (!$this->check_perms(EGW_ACL_DELETE,$row) || (!$GLOBALS['egw_info']['user']['apps']['admin'] && $this->config['history'] != 'userpurge' && $query['col_filter']['tid'] == addressbook_so::DELETED_TYPE))
{ {