extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

if user selection is switched to "no user selection at all", do not include users in calendar owner search results

Browse Source
This commit is contained in:
nathan 2022-10-03 16:11:47 -06:00
parent c7001bd0a5
commit 4ae6f15e37
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_owner_etemplate_widget.inc.php
View File

@ -169,6 +169,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
'filter' => array('account_id' => null)) + 'filter' => array('account_id' => null)) +
array_diff_key($_REQUEST, array_flip(array('menuaction','query'))); array_diff_key($_REQUEST, array_flip(array('menuaction','query')));
$results = array(); $results = array();
$is_admin = !!($GLOBALS['egw_info']['user']['apps']['admin']);
// Contacts matching accounts the user does not have permission for cause // Contacts matching accounts the user does not have permission for cause
// confusion as user selects the contact and there's nothing there, so // confusion as user selects the contact and there's nothing there, so
@ -182,8 +183,8 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$mapped = array(); $mapped = array();
$_results = array(); $_results = array();
// Handle Api\Accounts seperately // Handle Api\Accounts separately, if user is allowed to see accounts
if($type == '') if($type == '' && ($is_admin || !$is_admin && $GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] !== 'none'))
{ {
$owngroup_options = $options+array('account_type'=>'owngroups'); $owngroup_options = $options+array('account_type'=>'owngroups');
$own_groups = Api\Accounts::link_query('',$owngroup_options); $own_groups = Api\Accounts::link_query('',$owngroup_options);