[CalendarServer-changes] [13120] CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/ directory

[source_changes at macosforge.org]

Revision: 13120
          http://trac.calendarserver.org//changeset/13120
Author:   sagen at apple.com
Date:     2014-04-02 11:22:48 -0700 (Wed, 02 Apr 2014)
Log Message:
-----------
Update attribute names

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py	2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/addressbook.py	2014-04-02 18:22:48 UTC (rev 13120)
@@ -110,6 +110,8 @@
                 self.directory.recordType.user
             ]
         ]:
+            # FIXME: why don't we also pass in the name to the resource itself
+            # like we do for DirectoryCalendarHomeTypeProvisioningResource?
             self.putChild(recordTypeName, DirectoryAddressBookHomeTypeProvisioningResource(self, r))
 
         self.putChild(uidsResourceName, DirectoryAddressBookHomeUIDProvisioningResource(self))
@@ -191,7 +193,7 @@
             for record in (
                 yield self.directory.recordsWithRecordType(self.recordType)
             ):
-                if record.enabledForAddressBooks:
+                if getattr(record, "hasContacts", False):
                     for shortName in record.shortNames:
                         children.append(shortName)
 
@@ -214,7 +216,7 @@
 
 
     def displayName(self):
-        return self.recordType
+        return self.directory.recordTypeToOldName(self.recordType)
 
     ##
     # ACL
@@ -237,7 +239,7 @@
 
     homeResourceTypeName = 'addressbooks'
 
-    enabledAttribute = 'enabledForAddressBooks'
+    enabledAttribute = 'hasContacts'
 
 
     def homeResourceCreator(self, record, transaction):

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py	2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/calendar.py	2014-04-02 18:22:48 UTC (rev 13120)
@@ -237,7 +237,7 @@
 
     homeResourceTypeName = 'calendars'
 
-    enabledAttribute = 'enabledForCalendaring'
+    enabledAttribute = 'hasCalendars'
 
     def homeResourceCreator(self, record, transaction):
         return DirectoryCalendarHomeResource.createHomeResource(

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py	2014-04-02 18:22:36 UTC (rev 13119)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/common.py	2014-04-02 18:22:48 UTC (rev 13120)
@@ -37,6 +37,7 @@
 
 uidsResourceName = "__uids__"
 
+
 class CommonUIDProvisioningResource(object):
     """
     Common ancestor for addressbook/calendar UID provisioning resources.
@@ -71,11 +72,10 @@
             log.debug("No directory record with UID %r" % (name,))
             returnValue(None)
 
-        # MOVE2WHO
-        # if not getattr(record, self.enabledAttribute):
-        #     log.debug("Directory record %r is not enabled for %s" % (
-        #         record, self.homeResourceTypeName))
-        #     returnValue(None)
+        if not getattr(record, self.enabledAttribute, False):
+            log.debug("Directory record %r is not enabled for %s" % (
+                record, self.homeResourceTypeName))
+            returnValue(None)
 
         assert len(name) > 4, "Directory record has an invalid GUID: %r" % (
             name,)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140402/1074777e/attachment.html>