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 */