[CalendarServer-changes] [14921] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14921
          http://trac.calendarserver.org//changeset/14921
Author:   cdaboo at apple.com
Date:     2015-06-25 15:57:28 -0700 (Thu, 25 Jun 2015)
Log Message:
-----------
Add DAV header tokens for group attendee and sharee features.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/twistedcaldav/customxml.py
    CalendarServer/trunk/twistedcaldav/stdconfig.py
    CalendarServer/trunk/twistedcaldav/test/test_config.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/requirements-dev.txt	2015-06-25 22:57:28 UTC (rev 14921)
@@ -8,4 +8,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14917#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14920#egg=CalDAVTester

Modified: CalendarServer/trunk/twistedcaldav/customxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/customxml.py	2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/customxml.py	2015-06-25 22:57:28 UTC (rev 14921)
@@ -68,10 +68,18 @@
     "calendarserver-sharing-no-scheduling",
 )
 
+calendarserver_group_sharee_compliance = (
+    "calendarserver-group-sharee",
+)
+
 calendarserver_partstat_changes_compliance = (
     "calendarserver-partstat-changes",
 )
 
+calendarserver_group_attendee_compliance = (
+    "calendarserver-group-attendee",
+)
+
 calendarserver_home_sync_compliance = (
     "calendarserver-home-sync",
 )

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py	2015-06-25 22:57:28 UTC (rev 14921)
@@ -1720,6 +1720,8 @@
             compliance += customxml.calendarserver_sharing_compliance
             # TODO: This is only needed whilst we do not support scheduling in shared calendars
             compliance += customxml.calendarserver_sharing_no_scheduling_compliance
+            if config.Sharing.Calendars.Enabled and config.Sharing.Calendars.Groups.Enabled:
+                compliance += customxml.calendarserver_group_sharee_compliance
         if configDict.EnableCalendarQueryExtended:
             compliance += caldavxml.caldav_query_extended_compliance
         if configDict.EnableDefaultAlarms:
@@ -1728,6 +1730,8 @@
             compliance += caldavxml.caldav_managed_attachments_compliance
         if configDict.Scheduling.Options.TimestampAttendeePartStatChanges:
             compliance += customxml.calendarserver_partstat_changes_compliance
+        if config.GroupAttendees.Enabled:
+            compliance += customxml.calendarserver_group_attendee_compliance
         if configDict.EnableTimezonesByReference:
             compliance += caldavxml.caldav_timezones_by_reference_compliance
         compliance += customxml.calendarserver_recurrence_split

Modified: CalendarServer/trunk/twistedcaldav/test/test_config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_config.py	2015-06-25 22:56:48 UTC (rev 14920)
+++ CalendarServer/trunk/twistedcaldav/test/test_config.py	2015-06-25 22:57:28 UTC (rev 14921)
@@ -384,7 +384,21 @@
         config.EnableProxyPrincipals = False
         self.assertTrue("calendar-proxy" not in resource.davComplianceClasses())
 
+        self.assertTrue("calendarserver-group-sharee" in resource.davComplianceClasses())
+        config.Sharing.Calendars.Groups.Enabled = False
+        config.update()
+        self.assertTrue("calendarserver-group-sharee" not in resource.davComplianceClasses())
+        config.Sharing.Calendars.Groups.Enabled = True
+        config.update()
 
+        self.assertTrue("calendarserver-group-attendee" in resource.davComplianceClasses())
+        config.GroupAttendees.Enabled = False
+        config.update()
+        self.assertTrue("calendarserver-group-attendee" not in resource.davComplianceClasses())
+        config.GroupAttendees.Enabled = True
+        config.update()
+
+
     def test_logging(self):
         """
         Logging module configures properly.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150625/54b0f617/attachment-0001.html>