LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: a0ddb6969a3af4885bc30844a5dc0bcda95a8212

Browse source 
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:
Wolfgang Sourdeau 2010-03-15 12:51:57 +00:00
parent d7bca94299
commit 927c82cdc1
3 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -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>
* SoObjects/Appointments/SOGoAppointmentObject.m

24
UI/WebServerResources/SchedulerUI.js
View file

@ -1183,20 +1183,18 @@ function _setupEventsDragAndDrop(events) {
var setupFlags = {};
for (var i = 0; i < events.length; i++) {
if (events[i][11] == UserLogin) {
var cname = events[i][0];
var calendar = events[i][1];
var setupId = calendar + "_" + cname;
if (!setupFlags[setupId]) {
var occurrences = calendarEvents[calendar][cname];
for (var j = 0; j < occurrences.length; j++) {
var blocks = occurrences[j].blocks;
var dragController = new SOGoEventDragController();
dragController.updateDropCallback = updateEventFromDragging;
dragController.attachToEventCells(blocks);
}
setupFlags[setupId] = true;
var cname = events[i][0];
var calendar = events[i][1];
var setupId = calendar + "_" + cname;
if (!setupFlags[setupId]) {
var occurrences = calendarEvents[calendar][cname];
for (var j = 0; j < occurrences.length; j++) {
var blocks = occurrences[j].blocks;
var dragController = new SOGoEventDragController();
dragController.updateDropCallback = updateEventFromDragging;
dragController.attachToEventCells(blocks);
}
setupFlags[setupId] = true;
}
}
}

6
UI/WebServerResources/SchedulerUIDnD.js
View file

@ -980,9 +980,9 @@ SOGoEventDragController.prototype = {
if (target.nodeType == 1) {
if ((!this.eventCells
&& (target.hasClassName("clickableHourCell")
|| target.hasClassName("day"))
|| (this.eventCells && this.eventCells[0].editable
&& !this.eventIsInvitation))) {
|| target.hasClassName("day")))
|| (this.eventCells && this.eventCells[0].editable
&& !this.eventIsInvitation)) {
var utilities = SOGoEventDragUtilities();
utilities.setEventType(this.eventType);