holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar - fix bug where private events for multiple users in week view only showed for one user

Browse Source
This commit is contained in:
nathangray 2017-09-05 11:01:48 -06:00
parent 6ce1fd8142
commit d9bc278efd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_bo.inc.php
View File

@ -560,6 +560,8 @@ class calendar_bo
* otherwise the original recuring event (with the first start- + enddate) is returned * otherwise the original recuring event (with the first start- + enddate) is returned
* num_rows int number of entries to return, default or if 0, max_entries from the prefs * num_rows int number of entries to return, default or if 0, max_entries from the prefs
* order column-names plus optional DESC|ASC separted by comma * order column-names plus optional DESC|ASC separted by comma
* private_allowed array Array of user IDs that are allowed when clearing private
* info, defaults to users
* ignore_acl if set and true no check_perms for a general Acl::READ grants is performed * ignore_acl if set and true no check_perms for a general Acl::READ grants is performed
* enum_groups boolean if set and true, group-members will be added as participants with status 'G' * enum_groups boolean if set and true, group-members will be added as participants with status 'G'
* cols string|array columns to select, if set an iterator will be returned * cols string|array columns to select, if set an iterator will be returned
@ -669,7 +671,7 @@ class calendar_bo
} }
if (!$params['ignore_acl'] && ($is_private || (!$event['public'] && $filter == 'hideprivate'))) if (!$params['ignore_acl'] && ($is_private || (!$event['public'] && $filter == 'hideprivate')))
{ {
$this->clear_private_infos($events[$id],$users); $this->clear_private_infos($events[$id],$params['private_allowed'] ? $params['private_allowed'] : $users);
} }
} }

3
calendar/inc/class.calendar_uilist.inc.php
View File

@ -383,6 +383,9 @@ class calendar_uilist extends calendar_ui
{ {
$search_params['users'] = $params['owner'] ? $params['owner'] : explode(',',$this->owner); $search_params['users'] = $params['owner'] ? $params['owner'] : explode(',',$this->owner);
} }
// Allow private to stay for all viewed owners, even if in separate calendars
$search_params['private_allowed'] = (array)$params['selected_owners'] + (array)$search_params['users'];
if ($params['col_filter']) if ($params['col_filter'])
{ {
$col_filter = array(); $col_filter = array();

5
calendar/js/app.js
View File

@ -2811,7 +2811,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
if(need_data && seperate_owners) if(need_data && seperate_owners)
{ {
this._fetch_data( this._fetch_data(
jQuery.extend({}, state, {owner: value[i].owner}), jQuery.extend({}, state, {owner: value[i].owner, selected_owners: state.owner}),
this.sidebox_et2 ? null : this.et2.getInstanceManager() this.sidebox_et2 ? null : this.et2.getInstanceManager()
); );
need_data = false; need_data = false;
@ -2873,7 +2873,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
filter:'custom', // Must be custom to get start & end dates filter:'custom', // Must be custom to get start & end dates
status_filter: state.status_filter, status_filter: state.status_filter,
cat_id: cat_id, cat_id: cat_id,
csv_export: false csv_export: false,
selected_owners: state.selected_owners
}); });
// Show ajax loader // Show ajax loader
if(typeof framework !== 'undefined') if(typeof framework !== 'undefined')