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

Fix calendar participant does not show user accounts

Browse Source
This commit is contained in:
Hadi Nategh
2016-06-23 15:49:44 +02:00
parent 4d5daa4d3f
commit 1fab6876c4
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
$account_options = $options + array('account_type' => $a_type); $account_options = $options + array('account_type' => $a_type);
$_results += Api\Accounts::link_query($query,$account_options); $_results += Api\Accounts::link_query($query,$account_options);
} }
$_results = array_intersect_key($_results, $GLOBALS['egw']->acl->get_grants('calendar')); if (!$options['exec']['nocheckgrants']) $_results = array_intersect_key($_results, $GLOBALS['egw']->acl->get_grants('calendar'));
} }
else if ($data['app'] && Link::get_registry($data['app'], 'query')) else if ($data['app'] && Link::get_registry($data['app'], 'query'))
{ {

3
calendar/js/app.js
View File

@ -1060,7 +1060,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
start: content.start, start: content.start,
end: content.end, end: content.end,
duration: content.duration, duration: content.duration,
whole_day: content.whole_day whole_day: content.whole_day,
nocheckgrants: true
}}); }});
}, },