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

* Calendar: Fix selecting a group in planner by user view did not always load group members

Browse Source
This commit is contained in:
nathangray 2019-10-29 10:57:01 -06:00
parent 3b4e2e43c6
commit 6d00d548a8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_planner.js
View File

@ -382,6 +382,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var labels = []; var labels = [];
var already_added = []; var already_added = [];
var options = false; var options = false;
var resource = null;
if(app.calendar && app.calendar.sidebox_et2 && app.calendar.sidebox_et2.getWidgetById('owner')) if(app.calendar && app.calendar.sidebox_et2 && app.calendar.sidebox_et2.getWidgetById('owner'))
{ {
options = app.calendar.sidebox_et2.getWidgetById('owner').taglist.getSelection(); options = app.calendar.sidebox_et2.getWidgetById('owner').taglist.getSelection();
@ -395,9 +396,9 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var user = this.options.owner[i]; var user = this.options.owner[i];
// Handle grouped resources like mailing lists - pull it from sidebox owner // Handle grouped resources like mailing lists - pull it from sidebox owner
// and expand to their contents // and expand to their contents
if(isNaN(user) && options && options.find) if(options && options.find &&
((resource = options.find(function(element) {return element.id == user;}) || {}) || isNaN(user)))
{ {
var resource = options.find(function(element) {return element.id == user;}) || {};
if(resource && resource.resources) if(resource && resource.resources)
{ {
for(var j = 0; j < resource.resources.length; j++) for(var j = 0; j < resource.resources.length; j++)
@ -426,7 +427,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
} }
else if (user < 0) // groups else if (user < 0) // groups
{ {
egw.accountData(user,'account_fullname',true,function(result) { egw.accountData(parseInt(user),'account_fullname',true,function(result) {
for(var id in result) for(var id in result)
{ {
if(already_added.indexOf(''+id) < 0) if(already_added.indexOf(''+id) < 0)