From a1664aba3062a69502882f631dbbcc33cac7c56c Mon Sep 17 00:00:00 2001 From: znek Date: Mon, 16 Aug 2004 12:02:23 +0000 Subject: [PATCH] fixed redirect in deleteAction git-svn-id: http://svn.opengroupware.org/SOGo/trunk@254 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Scheduler/ChangeLog | 4 ++++ SOGo/UI/Scheduler/UIxAppointmentView.m | 7 ++++--- SOGo/UI/Scheduler/Version | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index 61287cd7..557b2a5e 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,5 +1,9 @@ 2004-08-16 Marcus Mueller + * v0.9.60 + + * UIxAppointmentView.m: fixed redirect in deleteAction. + * v0.9.59 * UIxTimeDateControl.m: subclasses from UIxComponent now, hence diff --git a/SOGo/UI/Scheduler/UIxAppointmentView.m b/SOGo/UI/Scheduler/UIxAppointmentView.m index dc3819a2..63ac54bd 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentView.m +++ b/SOGo/UI/Scheduler/UIxAppointmentView.m @@ -137,7 +137,8 @@ - (id)deleteAction { NSException *ex; - + id url; + if ([self appointment] == nil) { return [NSException exceptionWithHTTPStatus:404 /* Not Found */ reason:@"could not locate appointment"]; @@ -156,8 +157,8 @@ return ex; } -#warning TODO: fix redirect - return [[[self clientObject] container] baseURLInContext:[self context]]; + url = [[[self clientObject] container] baseURLInContext:[self context]]; + return [self redirectToLocation:url]; } @end /* UIxAppointmentView */ diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 1cf2745d..491c7813 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # $Id$ -SUBMINOR_VERSION:=59 +SUBMINOR_VERSION:=60 # v0.9.41 requires libNGObjWeb v4.2.431 # v0.9.31 requires libWEExtensions v4.2.52 -- 2.39.5