[CalendarServer-changes] [14725] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14725
          http://trac.calendarserver.org//changeset/14725
Author:   cdaboo at apple.com
Date:     2015-04-30 11:55:14 -0700 (Thu, 30 Apr 2015)
Log Message:
-----------
Fix per-delegate properties.

Modified Paths:
--------------
    CalendarServer/trunk/requirements-dev.txt
    CalendarServer/trunk/txdav/carddav/datastore/sql.py
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-04-30 18:28:03 UTC (rev 14724)
+++ CalendarServer/trunk/requirements-dev.txt	2015-04-30 18:55:14 UTC (rev 14725)
@@ -8,4 +8,4 @@
 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@14711#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14724#egg=CalDAVTester

Modified: CalendarServer/trunk/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/carddav/datastore/sql.py	2015-04-30 18:28:03 UTC (rev 14724)
+++ CalendarServer/trunk/txdav/carddav/datastore/sql.py	2015-04-30 18:55:14 UTC (rev 14725)
@@ -1187,7 +1187,7 @@
             # 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]

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2015-04-30 18:28:03 UTC (rev 14724)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2015-04-30 18:55:14 UTC (rev 14725)
@@ -3286,7 +3286,7 @@
             childResourceIDs = [dataRow[resourceID_index] 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
@@ -4577,9 +4577,9 @@
             # 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,
@@ -4683,9 +4683,9 @@
             # 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.ownerHome().authzuid(),
                     parent._txn,
                     tuple([row[0] for row in dataRows]),
                 ))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150430/3ab663ef/attachment.html>