[CalendarServer-changes] [13884] CalendarServer/trunk/txdav/caldav/datastore/sql.py

source_changes at macosforge.org source_changes at macosforge.org
Sat Aug 16 11:14:59 PDT 2014


Revision: 13884
          http://trac.calendarserver.org//changeset/13884
Author:   gaya at apple.com
Date:     2014-08-16 11:14:59 -0700 (Sat, 16 Aug 2014)
Log Message:
-----------
whitespace

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2014-08-16 18:13:50 UTC (rev 13883)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2014-08-16 18:14:59 UTC (rev 13884)
@@ -2037,7 +2037,7 @@
                     shareeView = yield super(Calendar, self).inviteUIDToShare(memberUID, newMode, summary)
                     shareeViews.append(shareeView)
 
-        # shared even if no sharees
+        # shared even if no group members
         yield self.setShared(True)
 
         returnValue(tuple(shareeViews))
@@ -2095,14 +2095,14 @@
                 if memberUID != self._home.uid():
                     shareeView = yield self.shareeView(memberUID)
                     if shareeView is not None:
-                            newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
-                            if newMode is None:
-                                if shareeView._bindMode != _BIND_MODE_DIRECT:
-                                    # one group or individual share: delete share
-                                    yield super(Calendar, self).uninviteUIDFromShare(memberUID)
-                            else:
-                                # multiple groups or group and individual was shared, update to new mode
-                                yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
+                        newMode = yield shareeView._groupModeAfterRemovingOneGroupSharee()
+                        if newMode is None:
+                            if shareeView._bindMode != _BIND_MODE_DIRECT:
+                                # one group or individual share: delete share
+                                yield super(Calendar, self).uninviteUIDFromShare(memberUID)
+                        else:
+                            # multiple groups or group and individual was shared, update to new mode
+                            yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
 
         else:
             shareeView = yield self.shareeView(shareeUID)
@@ -3149,7 +3149,6 @@
                     oldcomponent = yield self.componentForUser()
                     self.tr_change = iCalDiff(oldcomponent, component, False).timeRangeDifference()
 
-
             # Always do the per-user data merge right before we store
             component = (yield self.mergePerUserData(component, inserting))
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140816/2de0d290/attachment.html>


More information about the calendarserver-changes mailing list