amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-03 04:18:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: d8549ba070887e4694d144719b284413458362d9

Browse Source 
Monotone-Revision: f74baefe5e3f0349c95467a779b6791335eb0e19

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-27T16:00:18
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-11-27 16:00:18 +00:00
parent 18d64eeed6
commit 3a5eaf6c2f
2 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
UI/Scheduler/UIxAppointmentEditor.m
View File

@@ -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);

12
UI/WebServerResources/SchedulerUI.js
View File

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