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

Fix users in groups were doubled in planner view, if you selected additional users already in a selected group

Browse Source
This commit is contained in:
Nathan Gray 2015-11-16 17:15:43 +00:00
parent 406c96defe
commit 71bd17628d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/et2_widget_planner.js
View File

@ -374,7 +374,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
if(already_added.indexOf(user) < 0) if(already_added.indexOf(user) < 0)
{ {
labels.push({id: user, label: label, data: {participants:user,owner:''}}); labels.push({id: user, label: label, data: {participants:user,owner:''}});
already_added.push(user); already_added.push(''+user);
} }
} }
else if (user < 0) // groups else if (user < 0) // groups
@ -385,7 +385,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
if(already_added.indexOf(''+id) < 0) if(already_added.indexOf(''+id) < 0)
{ {
this.push({id: id, label: result[id], data: {participants:id,owner:id}}); this.push({id: id, label: result[id], data: {participants:id,owner:id}});
already_added.push(id); already_added.push(''+id);
} }
} }
},labels); },labels);
@ -398,7 +398,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
if(accounts[j].value === user) if(accounts[j].value === user)
{ {
labels.push({id: user, label: accounts[j].label, data: {participants:user,owner:user}}); labels.push({id: user, label: accounts[j].label, data: {participants:user,owner:user}});
already_added.push(user); already_added.push(''+user);
break; break;
} }
} }
@ -764,7 +764,6 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
// Group the events // Group the events
var events = {}; var events = {};
debugger;
for(var i = 0; i < this.value.length; i++) for(var i = 0; i < this.value.length; i++)
{ {
grouper.group.call(this, labels, events, this.value[i]); grouper.group.call(this, labels, events, this.value[i]);