[CalendarServer-changes] [11185] CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/ datastore

[source_changes at macosforge.org]

Revision: 11185
          http://trac.calendarserver.org//changeset/11185
Author:   gaya at apple.com
Date:     2013-05-14 19:00:02 -0700 (Tue, 14 May 2013)
Log Message:
-----------
fix group sharing

Modified Paths:
--------------
    CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml
    CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
    CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py

Modified: CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml
===================================================================
--- CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml	2013-05-15 00:52:45 UTC (rev 11184)
+++ CalDAVTester/branches/users/gaya/sharedgroupstester-3/scripts/tests/CardDAV/sharing-groups.xml	2013-05-15 02:00:02 UTC (rev 11185)
@@ -42,7 +42,7 @@
 	</start>
 	
 
-	<test-suite name='read-write' ignore='yes'>
+	<test-suite name='read-write' ignore='no'>
 		<test name='1' ignore='no'>
 			<description>Sharer creates 2 persons and a group</description>
 			<request print-response='no'>

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py	2013-05-15 00:52:45 UTC (rev 11184)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py	2013-05-15 02:00:02 UTC (rev 11185)
@@ -1538,8 +1538,8 @@
                     self._bindMessage = bindMessage
                     self._bindName = bindName
 
-                    if self.owned():
-                        yield self._init_isShared()
+                if self.owned():
+                    yield self._init_isShared()
 
             yield self._loadPropertyStore()
 

Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-15 00:52:45 UTC (rev 11184)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py	2013-05-15 02:00:02 UTC (rev 11185)
@@ -2900,7 +2900,7 @@
         @return: C{True} if shared, C{False} otherwise
         @rtype: C{bool}
         """
-        return self._bindMode == _BIND_MODE_OWN and self._bindMessage == "shared"
+        return self.owned() and self._bindMessage == "shared"
 
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130514/bc1b6de6/attachment-0001.html>