[CalendarServer-changes] [6037] CalendarServer/branches/users/glyph/sql-store/twistedcaldav/sharing. py

[source_changes at macosforge.org]

Revision: 6037
          http://trac.macosforge.org/projects/calendarserver/changeset/6037
Author:   glyph at apple.com
Date:     2010-08-10 14:32:27 -0700 (Tue, 10 Aug 2010)
Log Message:
-----------
document 'inviteProperty'

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/sql-store/twistedcaldav/sharing.py

Modified: CalendarServer/branches/users/glyph/sql-store/twistedcaldav/sharing.py
===================================================================
--- CalendarServer/branches/users/glyph/sql-store/twistedcaldav/sharing.py	2010-08-10 20:53:34 UTC (rev 6036)
+++ CalendarServer/branches/users/glyph/sql-store/twistedcaldav/sharing.py	2010-08-10 21:32:27 UTC (rev 6037)
@@ -60,13 +60,17 @@
         return self._invitesDB
 
     def inviteProperty(self, request):
-        
-        # Build the CS:invite property from our DB
+        """
+        Calculate the customxml.Invite property (for readProperty) from the
+        invites database.
+        """
+
         def sharedOK(isShared):
             if config.Sharing.Enabled and isShared:
                 self.validateInvites()
                 return customxml.Invite(
-                    *[record.makePropertyElement() for record in self.invitesDB().allRecords()]
+                    *[record.makePropertyElement() for
+                        record in self.invitesDB().allRecords()]
                 )
             else:
                 return None
@@ -526,8 +530,10 @@
         # Locate notifications collection for user
         sharee = self.principalForCalendarUserAddress(record.userid)
         if sharee is None:
-            raise ValueError("sharee is None but userid was valid before")        
-        notifications = self._newStoreParentHome._transaction.notificationsWithUID(sharee.principalUID())
+            raise ValueError("sharee is None but userid was valid before")
+        notifications = self._associatedTransaction.notificationsWithUID(
+            sharee.principalUID()
+        )
         
         # Look for existing notification
         oldnotification = notifications.notificationObjectWithUID(record.inviteuid)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100810/f9834c26/attachment.html>