holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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);
$_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'))
{
@ -209,7 +209,7 @@ class calendar_owner_etemplate_widget extends Etemplate\Widget\Taglist
{
$resource = $bo->resources[substr($id, 0,1)];
$label = Link::title($resource['app'], substr($id,1));
// Could not get via link, try via resources info
if($label === false)
{

9
calendar/js/app.js
View File

@ -1060,7 +1060,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
start: content.start,
end: content.end,
duration: content.duration,
whole_day: content.whole_day
whole_day: content.whole_day,
nocheckgrants: true
}});
},
@ -2030,7 +2031,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
);
var loading = false;
var value = [];
state.state.first = view.start_date(state.state).toJSON();
@ -2423,7 +2424,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
{
view.etemplates[i].resize();
}
// If we need to fetch data from the server, it will hide the loader
// when done but if everything is in the cache, hide from here.
if(!loading)
@ -2433,7 +2434,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
egw.loading_prompt(this.appname,false);
},this),500);
}
return;
}
// old calendar state handling on server-side (incl. switching to and from listview)