From 43518b507aab69b6d6fc4a628d4cd78b771d9ecf Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 19 Jul 2005 10:55:33 +0000 Subject: [PATCH] fixed SOGo Bug #1482 git-svn-id: http://svn.opengroupware.org/SOGo/trunk@823 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Scheduler/ChangeLog | 8 +++++++- SOGo/UI/Scheduler/UIxAppointmentEditor.m | 13 +++++++++---- SOGo/UI/Scheduler/Version | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog index a44be11b..f346ac44 100644 --- a/SOGo/UI/Scheduler/ChangeLog +++ b/SOGo/UI/Scheduler/ChangeLog @@ -1,8 +1,14 @@ 2005-07-19 Marcus Mueller + * v0.9.139 + + * UIxAppointmentEditor.m: fixed automatic participants addition + + * v0.9.138 + * UIxCalView.m: renamed 'anaisUIDString' to 'userUIDString' in order to be independent from the Anais bundle but still provide the same - functionality (v0.9.138) + functionality 2005-07-19 Helge Hess diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m index b2b99090..3b44c9da 100644 --- a/SOGo/UI/Scheduler/UIxAppointmentEditor.m +++ b/SOGo/UI/Scheduler/UIxAppointmentEditor.m @@ -631,7 +631,7 @@ Note: 'clientObject' is the SOGoAppointmentFolder! Update: remember that there are group folders as well. */ - NSString *uri, *objectId, *method; + NSString *uri, *objectId, *method, *ps; objectId = [NSClassFromString(@"SOGoAppointmentFolder") globallyUniqueObjectId]; @@ -643,14 +643,19 @@ method = [NSString stringWithFormat:@"Calendar/%@/edit", objectId]; method = [[self userFolderPath] stringByAppendingPathComponent:method]; - /* add all current calendarUIDs as default participants */ - if ([[self clientObject] respondsToSelector:@selector(calendarUIDs)]) { + /* check if participants have already been provided */ + ps = [[[self context] request] formValueForKey:@"ps"]; + if (ps) { + [self setQueryParameter:ps forKey:@"ps"]; + } + else if ([[self clientObject] respondsToSelector:@selector(calendarUIDs)]) { AgenorUserManager *um; NSArray *uids; NSMutableArray *emails; - NSString *ps; unsigned i, count; + /* add all current calendarUIDs as default participants */ + um = [AgenorUserManager sharedUserManager]; uids = [[self clientObject] calendarUIDs]; count = [uids count]; diff --git a/SOGo/UI/Scheduler/Version b/SOGo/UI/Scheduler/Version index 358e5c98..6b80c214 100644 --- a/SOGo/UI/Scheduler/Version +++ b/SOGo/UI/Scheduler/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=138 +SUBMINOR_VERSION:=139 # v0.9.136 requires SOGoUI v0.9.30 # v0.9.123 requires Appointments v0.9.35 -- 2.39.5