From 90ba69e2ee4a7d34487da1801b3af0c3fbd16dbb Mon Sep 17 00:00:00 2001 From: znek Date: Thu, 12 Aug 2004 21:00:17 +0000 Subject: [PATCH] should work, but doesn't properly git-svn-id: http://svn.opengroupware.org/SOGo/trunk@196 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Scheduler/ChangeLog | 7 +++++++ SOGo/UI/Scheduler/UIxAppointmentEditor.m | 24 +++++++++++++++------- SOGo/UI/Scheduler/UIxAppointmentEditor.wox | 9 +++++--- SOGo/UI/Scheduler/Version | 2 +- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 5fbaf8df..80aed267 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,3 +1,10 @@ +2004-08-12 Marcus Mueller + + * v0.9.25 + + * UIxAppointmentEditor.[m|wox]: participants are added correctly + now, resources are still lacking from save. + 2004-08-12 Marcus Mueller * v0.9.24 diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m index c7954755..7f0fe2cb 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m @@ -186,9 +186,9 @@ @" checkbox = document.createElement('input');" @" checkbox.setAttribute('type', 'checkbox');" @" checkbox.setAttribute('checked', 'checked');" - @" checkbox.setAttribute('value', '1');" + @" checkbox.setAttribute('value', email);" @" checkbox.setAttribute('id', email);" - @" checkbox.setAttribute('name', email);" + @" checkbox.setAttribute('name', tableId);" @" td.appendChild(checkbox);" @" tr.appendChild(td);" @" td = document.createElement('td');" @@ -278,6 +278,17 @@ return date; } +- (id)testAction { + WORequest *req; + + NSLog(@"%s BEEN HERE!", + __PRETTY_FUNCTION__); + + req = [[self context] request]; + NSLog(@"%@", [req formValues]); + return self; +} + - (id)saveAction { SOGoAppointment *apt; NSString *iCalString; @@ -290,12 +301,12 @@ req = [[self context] request]; /* get iCalString from hidden input */ - iCalString = [req formValueForKey:@"ical"]; if ([iCalString length] == 0) { // TODO: improve user experience ... (eg error panel like Zope) - return [NSException exceptionWithHTTPStatus:400 /* bad request */ - reason:@"missing iCalendar form data in request"]; + /* return 400 == Bad Request */ + return [NSException exceptionWithHTTPStatus:400 + reason:@"missing iCalendar form data in request"]; } apt = [[SOGoAppointment alloc] initWithICalString:iCalString]; @@ -313,8 +324,7 @@ [apt setLocation:location]; [apt removeAllAttendees]; /* clean up */ - ps = [[req formValueForKey:@"participants"] - componentsSeparatedByString:@"\n"]; + ps = [req formValuesForKey:@"participants"]; count = [ps count]; for (i = 0; i < count; i++) { NSString *email; diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox index 3c04fdbe..23e1e024 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.wox +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.wox @@ -140,9 +140,11 @@ - TODO: Owner + TODO: EMAIL(!) @@ -190,8 +192,9 @@ - + + diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index a281cca1..8b283eb3 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=24 +SUBMINOR_VERSION:=25 -- 2.39.2