fixed SOGo Bug #1482

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@823 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Scheduler/ChangeLog b/SOGo/UI/Scheduler/ChangeLog
index a44be11bf80384d61d10449c8e87bd4d4924bfec..f346ac44d6ac48b7d549860b7b945da7ec975119 100644 (file)
--- a/SOGo/UI/Scheduler/ChangeLog
+++ b/SOGo/UI/Scheduler/ChangeLog
@@ -1,8 +1,14 @@
 2005-07-19  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+       * 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  <helge.hess@opengroupware.org>
 

diff --git a/SOGo/UI/Scheduler/UIxAppointmentEditor.m b/SOGo/UI/Scheduler/UIxAppointmentEditor.m
index b2b99090660fba21f796a2841b31da2d8bc7097a..3b44c9dadcf1c24dfd37c2d8ea95afb24547dd3d 100644 (file)
--- 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 358e5c98208dfd9b10ef7a208eae7d8061e825e7..6b80c214d55610e8160e3d6474caf88b33288281 100644 (file)
--- 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