From 927c82cdc10b85c03ca04a35ffb0704cce31addc Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 15 Mar 2010 12:51:57 +0000
Subject: [PATCH] Monotone-Parent: a0ddb6969a3af4885bc30844a5dc0bcda95a8212
 Monotone-Revision: 5617028c92b280b921baa88c04ea7e1430dbef8a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-03-15T12:51:57
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                               |  9 +++++++++
 UI/WebServerResources/SchedulerUI.js    | 24 +++++++++++-------------
 UI/WebServerResources/SchedulerUIDnD.js |  6 +++---
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d9a92c04..2cd127e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 45c19410e..07f270074 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -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;
         }
     }
 }
diff --git a/UI/WebServerResources/SchedulerUIDnD.js b/UI/WebServerResources/SchedulerUIDnD.js
index 10ba4ce1b..6494f0977 100644
--- a/UI/WebServerResources/SchedulerUIDnD.js
+++ b/UI/WebServerResources/SchedulerUIDnD.js
@@ -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);