[CalendarServer-changes] [11957] CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py

[source_changes at macosforge.org]

Revision: 11957
          http://trac.calendarserver.org//changeset/11957
Author:   gaya at apple.com
Date:     2013-11-15 13:55:22 -0800 (Fri, 15 Nov 2013)
Log Message:
-----------
fix GroupAttendeeReconciliationWork setting of MEMBER param on attendee property

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py

Modified: CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py	2013-11-15 21:13:28 UTC (rev 11956)
+++ CalendarServer/branches/users/sagen/groupcacher/twext/who/groups.py	2013-11-15 21:55:22 UTC (rev 11957)
@@ -179,17 +179,17 @@
 
             # remove attendee or update MEMBER attribute for non-primary attendees in this group,
             for attendeeProp in oldAttendeeProps:
-                memberParam = attendeeProp.getParameter("MEMBER")
-                if memberParam:
-                    if groupUUID in memberParam.getValues():
+                if attendeeProp.hasParameter("MEMBER"):
+                    parameterValues = attendeeProp.parameterValues("MEMBER")
+                    if groupUUID in parameterValues:
                         if attendeeProp.value() not in individualUUIDs:
-                            valueCount = memberParam.removeValue(groupUUID)
-                            if valueCount == 0:
+                            attendeeProp.removeParameterValue("MEMBER", groupUUID)
+                            if not attendeeProp.parameterValues("MEMBER"):
                                 component.removeProperty(attendeeProp)
                             changed = True
                     else:
                         if attendeeProp.value() in individualUUIDs:
-                            memberParam.addValue(groupUUID)
+                            attendeeProp.setParameter("MEMBER", parameterValues + [groupUUID, ])
                             changed = True
 
         # replace old with new
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/532e3d31/attachment.html>