[CalendarServer-changes] [10087] CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/ datastore/sql.py

[source_changes at macosforge.org]

Revision: 10087
          http://trac.calendarserver.org//changeset/10087
Author:   gaya at apple.com
Date:     2012-11-26 17:25:58 -0800 (Mon, 26 Nov 2012)
Log Message:
-----------
Partial fix for setComponent() update to revision table.

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py

Modified: CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2012-11-26 23:17:46 UTC (rev 10086)
+++ CalendarServer/branches/users/gaya/sharedgroups/txdav/carddav/datastore/sql.py	2012-11-27 01:25:58 UTC (rev 10087)
@@ -553,17 +553,24 @@
         validateAddressBookComponent(self, self._addressbook, component, inserting)
 
         yield self.updateDatabase(component, inserting=inserting)
+
+        ownerAddressBook = yield self.ownerAddressBook()
+
         if inserting:
-            yield self._addressbook._insertRevision(self._name)
+            yield ownerAddressBook._insertRevision(self._name)
         else:
-            yield self._addressbook._updateRevision(self._name)
+            yield ownerAddressBook._updateRevision(self._name)
 
-        yield self._addressbook.notifyChanged()
+        yield ownerAddressBook.notifyChanged()
 
+        #FIXME: handle case where owner changes group.  Also check remove()
 
+
     @inlineCallbacks
     def _ownerGroupAndAddressBook(self):
-        # find the owning address book
+        """ 
+        Find the owner shared group and owner address book.  owner shared group may be None 
+        """
         ownerGroup = None
         ownerAddressBook = None
         if self._addressbook.owned():
@@ -581,7 +588,6 @@
 
     @inlineCallbacks
     def ownerGroup(self):
-
         if not hasattr(self, "_ownerGroup"):
             self._ownerGroup, self._ownerAddressBook = yield self._ownerGroupAndAddressBook()
         returnValue(self._ownerGroup)
@@ -589,7 +595,6 @@
 
     @inlineCallbacks
     def ownerAddressBook(self):
-
         if not hasattr(self, "_ownerAddressBook"):
             self._ownerGroup, self._ownerAddressBook = yield self._ownerGroupAndAddressBook()
         returnValue(self._ownerAddressBook)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20121126/8aa58371/attachment-0001.html>