From 5101fb794c6c2288e8de338b19b49f673b912fe7 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 11 Oct 2006 18:56:04 +0000 Subject: [PATCH] Monotone-Parent: 2c4979aac05ff59d2bca154679eb3ebc8df8cd8f Monotone-Revision: 510d3e8a2a93557f4bdd594453d09b724e3b54d7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-11T18:56:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/Scheduler/UIxAppointmentEditor.m | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4f7b87693..d594e6b9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-10-11 Wolfgang Sourdeau + * UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor + -saveUrl]): returns the url needed to POST the new form to. + redirect the user to /editAsAppointment instead of /edit, + so that SOGoAppointmentFolder can return the correct object type. + * SoObjects/SOGo/NSObject+AptComparison.m ([NSObject -compareAptsAscending:_other]): accept empty start or end dates. diff --git a/UI/Scheduler/UIxAppointmentEditor.m b/UI/Scheduler/UIxAppointmentEditor.m index 863900fb0..27b9fff86 100644 --- a/UI/Scheduler/UIxAppointmentEditor.m +++ b/UI/Scheduler/UIxAppointmentEditor.m @@ -647,7 +647,7 @@ reason:@"could not create a unique ID"]; } - method = [NSString stringWithFormat:@"Calendar/%@/edit", objectId]; + method = [NSString stringWithFormat:@"Calendar/%@/editAsAppointment", objectId]; method = [[self userFolderPath] stringByAppendingPathComponent:method]; /* check if participants have already been provided */ @@ -1038,6 +1038,12 @@ return [self redirectToLocation:[self _completeURIForMethod:@".."]]; } +- (NSString *) saveUrl +{ + return [NSString stringWithFormat: @"%@/saveAsAppointment", + [[self clientObject] baseURL]]; +} + - (id)acceptAction { return [self acceptOrDeclineAction:YES]; }