(fix) handle default classification for tasks (fixes #3541)

Alinto · Mar 23, 2016 · 3a9c28f · 3a9c28f
1 parent 0291b49
commit 3a9c28f
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 32 deletions.
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1759,37 +1759,6 @@ - (void) _adjustTransparencyInRequestCalendar: (iCalCalendar *) rqCalendar
     }
 }
 
-- (void) _adjustClassificationInRequestCalendar: (iCalCalendar *) rqCalendar
-{
-  SOGoUserDefaults *userDefaults;
-  NSString *accessClass;
-  NSArray *allObjects;
-  id entity;
-
-  int i;
-
-  userDefaults = [[context activeUser] userDefaults];
-  allObjects = [rqCalendar allObjects];
-
-  for (i = 0; i < [allObjects count]; i++)
-    {
-      entity = [allObjects objectAtIndex: i];
-
-      if ([entity respondsToSelector: @selector(accessClass)])
-        {
-          accessClass = [entity accessClass];
-
-          if (!accessClass || [accessClass length] == 0)
-            {
-              if ([entity isKindOfClass: [iCalEvent class]])
-                [entity setAccessClass: [userDefaults calendarEventsDefaultClassification]];
-              else if ([entity isKindOfClass: [iCalToDo class]])
-                [entity setAccessClass: [userDefaults calendarTasksDefaultClassification]];
-            }
-        }
-    }
-}
-
 //
 // iOS devices (and potentially others) send event invitations with no PARTSTAT defined.
 // This confuses DAV clients like Thunderbird, or event SOGo web. The RFC says:
@@ -2006,7 +1975,7 @@ - (NSException *) updateContentWithCalendar: (iCalCalendar *) calendar
         }
 
       [self _adjustEventsInRequestCalendar: calendar];
-      [self _adjustClassificationInRequestCalendar: calendar];
+      [self adjustClassificationInRequestCalendar: calendar];
       [self _adjustPartStatInRequestCalendar: calendar];
     }
 

diff --git a/SoObjects/Appointments/SOGoCalendarComponent.h b/SoObjects/Appointments/SOGoCalendarComponent.h
@@ -94,6 +94,8 @@
 
 - (void) snoozeAlarm: (unsigned int) minutes;
 
+- (void) adjustClassificationInRequestCalendar: (iCalCalendar *) rqCalendar;
+
 @end
 
 #endif /* SOGOCALENDARCOMPONENT_H */
diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m
@@ -1445,4 +1445,36 @@ - (id) PUTAction: (WOContext *) localContext
 //   return values;
 // }
 
+- (void) adjustClassificationInRequestCalendar: (iCalCalendar *) rqCalendar
+{
+  SOGoUserDefaults *userDefaults;
+  NSString *accessClass;
+  NSArray *allObjects;
+  id entity;
+
+  int i;
+
+  userDefaults = [[context activeUser] userDefaults];
+  allObjects = [rqCalendar allObjects];
+
+  for (i = 0; i < [allObjects count]; i++)
+    {
+      entity = [allObjects objectAtIndex: i];
+
+      if ([entity respondsToSelector: @selector(accessClass)])
+        {
+          accessClass = [entity accessClass];
+
+          if (!accessClass || [accessClass length] == 0)
+            {
+              if ([entity isKindOfClass: [iCalEvent class]])
+                [entity setAccessClass: [userDefaults calendarEventsDefaultClassification]];
+              else if ([entity isKindOfClass: [iCalToDo class]])
+                [entity setAccessClass: [userDefaults calendarTasksDefaultClassification]];
+            }
+        }
+    }
+}
+
+
 @end
diff --git a/SoObjects/Appointments/SOGoTaskObject.m b/SoObjects/Appointments/SOGoTaskObject.m
@@ -21,6 +21,8 @@
 
 #import <Foundation/NSCalendarDate.h>
 
+#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGExtensions/NSObject+Logs.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGCards/iCalCalendar.h>
@@ -105,4 +107,17 @@ - (void) prepareDeleteOccurence: (iCalToDo *) occurence
 
 }
 
+- (id) PUTAction: (WOContext *) _ctx
+{
+  iCalCalendar *rqCalendar;
+  WORequest *rq;
+
+  rq = [_ctx request];
+  rqCalendar = [iCalCalendar parseSingleFromSource: [rq contentAsString]];
+  [self adjustClassificationInRequestCalendar: rqCalendar];
+  [rq setContent: [[rqCalendar versitString] dataUsingEncoding: [rq contentEncoding]]];
+
+  return [super PUTAction: _ctx];
+}
+
 @end /* SOGoTaskObject */