[CalendarServer-changes] [10112] CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/ sharing.py

[source_changes at macosforge.org]

Revision: 10112
          http://trac.calendarserver.org//changeset/10112
Author:   gaya at apple.com
Date:     2012-11-29 12:47:16 -0800 (Thu, 29 Nov 2012)
Log Message:
-----------
don't set displayname on shared address books

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/sharing.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/sharing.py	2012-11-29 18:27:47 UTC (rev 10111)
+++ CalendarServer/branches/users/gaya/sharedgroups/twistedcaldav/sharing.py	2012-11-29 20:47:16 UTC (rev 10112)
@@ -1113,11 +1113,12 @@
         #FIXME: addcresourceType to dead properties for share groups -
         #        it's already there for shared address book and calendars
         if isNewShare and sharedCollection.isGroup():
-                shareeCollection.writeDeadProperty(carddavxml.ResourceType.addressbook)
+            shareeCollection.writeDeadProperty(carddavxml.ResourceType.addressbook)
 
-        # Set per-user displayname or color to whatever was given
-        if displayname:
+        # For calendars only, per-user displayname and color
+        if displayname and shareeCollection.isCalendarCollection():
             yield shareeCollection.writeProperty(element.DisplayName.fromString(displayname), request)
+
         if color:
             yield shareeCollection.writeProperty(customxml.CalendarColor.fromString(color), request)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121129/16d79487/attachment.html>