From 3a5eaf6c2fe4fb75403b1fd672b8a75c08dd35a9 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 27 Nov 2007 16:00:18 +0000
Subject: [PATCH] Monotone-Parent: d8549ba070887e4694d144719b284413458362d9
 Monotone-Revision: f74baefe5e3f0349c95467a779b6791335eb0e19

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-27T16:00:18
Monotone-Branch: ca.inverse.sogo
---
 UI/Scheduler/UIxAppointmentEditor.m  | 20 ++++++++++----------
 UI/WebServerResources/SchedulerUI.js | 12 ++++--------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m
index 44887adb3..911b2404a 100644
--- a/UI/Scheduler/UIxAppointmentEditor.m
+++ b/UI/Scheduler/UIxAppointmentEditor.m
@@ -271,16 +271,7 @@
   iCalRecurrenceRule *rule;
 
   [self event];
-  if (event)
-    {
-      startDate = [event startDate];
-      isAllDay = [event isAllDay];
-      if (isAllDay)
-	endDate = [[event endDate] dateByAddingYears: 0 months: 0 days: -1];
-      else
-	endDate = [event endDate];
-    }
-  else
+  if ([[self clientObject] isNew])
     {
       startDate = [self newStartDate];
       duration = [self queryParameterForKey:@"dur"];
@@ -292,6 +283,15 @@
 	= [startDate dateByAddingYears: 0 months: 0 days: 0
 		     hours: 0 minutes: minutes seconds: 0];
     }
+  else
+    {
+      startDate = [event startDate];
+      isAllDay = [event isAllDay];
+      if (isAllDay)
+	endDate = [[event endDate] dateByAddingYears: 0 months: 0 days: -1];
+      else
+	endDate = [event endDate];
+    }
 
   ASSIGN (aptStartDate, startDate);
   ASSIGN (aptEndDate, endDate);
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 32ea684af..96a035a8e 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -24,16 +24,13 @@ var usersRightsWindowHeight = 250;
 var usersRightsWindowWidth = 502;
 
 function newEvent(sender, type) {
-   var day = sender.day;
+   var day = sender.readAttribute("day");
    if (!day)
       day = currentDay;
-
-   var hour = sender.hour;
-   if (!hour)
-      hour = sender.getAttribute("hour");
+   var hour = sender.readAttribute("hour");
    var folder = getSelectedFolder();
-   var folderID = folder.getAttribute("id");
-   var roles = folder.getAttribute("roles");
+   var folderID = folder.readAttribute("id");
+   var roles = folder.readAttribute("roles");
    if (roles) {
      roles = roles.split(",")
        if ($(roles).indexOf("PublicModifier") < 0)
@@ -47,7 +44,6 @@ function newEvent(sender, type) {
       params.push("hm=" + hour);
    if (params.length > 0)
       urlstr += "?" + params.join("&");
-   
    window.open(urlstr, "", "width=490,height=470,resizable=0");
    
    return false; /* stop following the link */