[CalendarServer-changes] [14347] CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/ resource.py

[source_changes at macosforge.org]

Revision: 14347
          http://trac.calendarserver.org//changeset/14347
Author:   cdaboo at apple.com
Date:     2015-01-27 10:38:09 -0800 (Tue, 27 Jan 2015)
Log Message:
-----------
iSchedule capabilities should list the actual supported component types.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2015-01-26 22:04:34 UTC (rev 14346)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/ischedule/resource.py	2015-01-27 18:38:09 UTC (rev 14347)
@@ -179,31 +179,35 @@
                     "version": "2.0",
                 })
             )
-        result = ischedulexml.QueryResult(
 
-            ischedulexml.Capabilities(
-                ischedulexml.Version.fromString(config.Scheduling.iSchedule.SerialNumber),
-                ischedulexml.Versions(
-                    ischedulexml.Version.fromString("1.0"),
-                ),
-                ischedulexml.SchedulingMessages(
+        componentTypes = []
+        from twistedcaldav.ical import allowedSchedulingComponents
+        for name in allowedSchedulingComponents:
+            if name == "VFREEBUSY":
+                componentTypes.append(
                     ischedulexml.Component(
                         ischedulexml.Method(name="REQUEST"),
-                        ischedulexml.Method(name="CANCEL"),
-                        ischedulexml.Method(name="REPLY"),
-                        name="VEVENT"
-                    ),
+                        name=name
+                    )
+                )
+            else:
+                componentTypes.append(
                     ischedulexml.Component(
                         ischedulexml.Method(name="REQUEST"),
                         ischedulexml.Method(name="CANCEL"),
                         ischedulexml.Method(name="REPLY"),
-                        name="VTODO"
-                    ),
-                    ischedulexml.Component(
-                        ischedulexml.Method(name="REQUEST"),
-                        name="VFREEBUSY"
-                    ),
+                        name=name
+                    )
+                )
+
+        result = ischedulexml.QueryResult(
+
+            ischedulexml.Capabilities(
+                ischedulexml.Version.fromString(config.Scheduling.iSchedule.SerialNumber),
+                ischedulexml.Versions(
+                    ischedulexml.Version.fromString("1.0"),
                 ),
+                ischedulexml.SchedulingMessages(*componentTypes),
                 ischedulexml.CalendarDataTypes(*dataTypes),
                 ischedulexml.Attachments(
                     ischedulexml.External(),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150127/e22a6629/attachment-0001.html>