Monotone-Parent: a0ddb6969a3af4885bc30844a5dc0bcda95a8212
Monotone-Revision: 5617028c92b280b921baa88c04ea7e1430dbef8a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-03-15T12:51:57 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
d7bca94299
commit
927c82cdc1
|
@ -1,3 +1,12 @@
|
||||||
|
2010-03-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* UI/WebServerResources/SchedulerUIDnD.js (onDragStart): typo.
|
||||||
|
|
||||||
|
* UI/WebServerResources/SchedulerUI.js (_setupEventsDragAndDrop):
|
||||||
|
we were setting up drag controllers only for events belonging to
|
||||||
|
the current user. Now that we handle the "editable" flag, this
|
||||||
|
had become a limitation.
|
||||||
|
|
||||||
2010-03-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2010-03-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* SoObjects/Appointments/SOGoAppointmentObject.m
|
* SoObjects/Appointments/SOGoAppointmentObject.m
|
||||||
|
|
|
@ -1183,20 +1183,18 @@ function _setupEventsDragAndDrop(events) {
|
||||||
var setupFlags = {};
|
var setupFlags = {};
|
||||||
|
|
||||||
for (var i = 0; i < events.length; i++) {
|
for (var i = 0; i < events.length; i++) {
|
||||||
if (events[i][11] == UserLogin) {
|
var cname = events[i][0];
|
||||||
var cname = events[i][0];
|
var calendar = events[i][1];
|
||||||
var calendar = events[i][1];
|
var setupId = calendar + "_" + cname;
|
||||||
var setupId = calendar + "_" + cname;
|
if (!setupFlags[setupId]) {
|
||||||
if (!setupFlags[setupId]) {
|
var occurrences = calendarEvents[calendar][cname];
|
||||||
var occurrences = calendarEvents[calendar][cname];
|
for (var j = 0; j < occurrences.length; j++) {
|
||||||
for (var j = 0; j < occurrences.length; j++) {
|
var blocks = occurrences[j].blocks;
|
||||||
var blocks = occurrences[j].blocks;
|
var dragController = new SOGoEventDragController();
|
||||||
var dragController = new SOGoEventDragController();
|
dragController.updateDropCallback = updateEventFromDragging;
|
||||||
dragController.updateDropCallback = updateEventFromDragging;
|
dragController.attachToEventCells(blocks);
|
||||||
dragController.attachToEventCells(blocks);
|
|
||||||
}
|
|
||||||
setupFlags[setupId] = true;
|
|
||||||
}
|
}
|
||||||
|
setupFlags[setupId] = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -980,9 +980,9 @@ SOGoEventDragController.prototype = {
|
||||||
if (target.nodeType == 1) {
|
if (target.nodeType == 1) {
|
||||||
if ((!this.eventCells
|
if ((!this.eventCells
|
||||||
&& (target.hasClassName("clickableHourCell")
|
&& (target.hasClassName("clickableHourCell")
|
||||||
|| target.hasClassName("day"))
|
|| target.hasClassName("day")))
|
||||||
|| (this.eventCells && this.eventCells[0].editable
|
|| (this.eventCells && this.eventCells[0].editable
|
||||||
&& !this.eventIsInvitation))) {
|
&& !this.eventIsInvitation)) {
|
||||||
var utilities = SOGoEventDragUtilities();
|
var utilities = SOGoEventDragUtilities();
|
||||||
utilities.setEventType(this.eventType);
|
utilities.setEventType(this.eventType);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue