Merge r14725 from trunk.

git-svn-id: https://svn.calendarserver.org/repository/calendarserver/CalendarServer/branches/release/CalendarServer-6.1-dev@14733 e27351fd-9f3e-4f54-a53b-843176b1656c
ashishpratapsingh14 · May 1, 2015 · 37c695c · 37c695c
1 parent 919d0dc
commit 37c695c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -8,4 +8,4 @@ mockldap
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14493#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/branches/release/CalDAVTester-6.1-dev@14732#egg=CalDAVTester
diff --git a/txdav/carddav/datastore/sql.py b/txdav/carddav/datastore/sql.py
@@ -1188,7 +1188,7 @@ def loadAllObjects(cls, home):
             # Get property stores for all these child resources (if any found)
             addressbookPropertyStoreIDs = [ownerHomeItem._addressbookPropertyStoreID for ownerHomeItem in ownerHomeToDataRowMap]
             propertyStores = yield PropertyStore.forMultipleResourcesWithResourceIDs(
-                home.uid(), None, None, home._txn, addressbookPropertyStoreIDs
+                home.uid(), None, home.authzuid(), home._txn, addressbookPropertyStoreIDs
             )
 
             addressbookResourceIDs = [ownerHomeItem.addressbook()._resourceID for ownerHomeItem in ownerHomeToDataRowMap]

diff --git a/txdav/common/datastore/sql.py b/txdav/common/datastore/sql.py
@@ -5813,7 +5813,7 @@ def loadAllObjects(cls, home):
             childResourceIDs = [dataRow[2] for dataRow in dataRows]
 
             propertyStores = yield PropertyStore.forMultipleResourcesWithResourceIDs(
-                home.uid(), None, None, home._txn, childResourceIDs
+                home.uid(), None, home.authzuid(), home._txn, childResourceIDs
             )
 
             # Get revisions
@@ -6938,9 +6938,9 @@ def loadAllObjects(cls, parent):
             # Get property stores for all these child resources (if any found)
             if parent.objectResourcesHaveProperties():
                 propertyStores = (yield PropertyStore.forMultipleResources(
-                    parent._home.uid(),
-                    None,
-                    None,
+                    parent.ownerHome().uid(),
+                    parent.viewerHome().uid(),
+                    parent._home.authzuid(),
                     parent._txn,
                     cls._objectSchema.RESOURCE_ID,
                     cls._objectSchema.PARENT_RESOURCE_ID,
@@ -7044,9 +7044,9 @@ def _loadAllObjectsWithNames(cls, parent, names):
             # Get property stores for all these child resources
             if parent.objectResourcesHaveProperties():
                 propertyStores = (yield PropertyStore.forMultipleResourcesWithResourceIDs(
-                    parent._home.uid(),
-                    None,
-                    None,
+                    parent.ownerHome().uid(),
+                    parent.viewerHome().uid(),
+                    parent._home.authzuid(),
                     parent._txn,
                     tuple([row[0] for row in dataRows]),
                 ))