[CalendarServer-changes] [2228] CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

[source_changes at macosforge.org]

Revision: 2228
          http://trac.macosforge.org/projects/calendarserver/changeset/2228
Author:   cdaboo at apple.com
Date:     2008-03-17 13:44:09 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
Allow calendar-disabled users in XML accounts.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py

Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2008-03-16 20:49:18 UTC (rev 2227)
+++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py	2008-03-17 20:44:09 UTC (rev 2228)
@@ -197,6 +197,7 @@
         result.members = self.members
         result.calendarUserAddresses = calendarUserAddresses
         result.autoSchedule = self.autoSchedule
+        result.enabledForCalendaring = self.enabledForCalendaring
         result.proxies = self.proxies
         return result
 
@@ -228,9 +229,9 @@
                     raise ValueError("<auto-schedule> element only allowed for Resources and Locations: %s" % (child_name,))
                 self.autoSchedule = True
             elif child_name == ELEMENT_DISABLECALENDAR:
-                # Only Groups
-                if self.recordType not in (DirectoryService.recordType_groups):
-                    raise ValueError("<disable-calendar> element only allowed for Groups: %s" % (child_name,))
+                # Only Users or Groups
+                if self.recordType not in (DirectoryService.recordType_users, DirectoryService.recordType_groups):
+                    raise ValueError("<disable-calendar> element only allowed for Users or Groups: %s" % (child_name,))
                 self.enabledForCalendaring = False
             elif child_name == ELEMENT_PROXIES:
                 # Only Resources & Locations

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080317/1e2af880/attachment.html