[CalendarServer-changes] [13736] CalendarServer/branches/users/gaya/groupsharee2/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 8 17:54:03 PDT 2014
Revision: 13736
http://trac.calendarserver.org//changeset/13736
Author: gaya at apple.com
Date: 2014-07-08 17:54:03 -0700 (Tue, 08 Jul 2014)
Log Message:
-----------
Allow group and individual sharee at the same time. Use higher-level sharing API for group sharee mods.
Modified Paths:
--------------
CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current.sql
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_45_to_46.sql
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_45_to_46.sql
CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-09 00:54:03 UTC (rev 13736)
@@ -82,11 +82,10 @@
from txdav.common.datastore.sql import CommonHome, CommonHomeChild, \
CommonObjectResource, ECALENDARTYPE
from txdav.common.datastore.sql_tables import _ATTACHMENTS_MODE_NONE, \
- _ATTACHMENTS_MODE_WRITE, schema, _BIND_MODE_OWN, \
- _ATTACHMENTS_MODE_READ, _TRANSP_OPAQUE, _TRANSP_TRANSPARENT, \
- _BIND_MODE_GROUP, _BIND_MODE_READ, _BIND_MODE_WRITE, _BIND_MODE_DIRECT, \
- _BIND_STATUS_ACCEPTED, _BIND_STATUS_DECLINED, _BIND_STATUS_INVALID, \
- _BIND_STATUS_INVITED, _BIND_STATUS_DELETED
+ _ATTACHMENTS_MODE_READ, _ATTACHMENTS_MODE_WRITE, _BIND_MODE_DIRECT, \
+ _BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE, \
+ _BIND_MODE_OWN, _BIND_MODE_READ, _BIND_MODE_WRITE, _TRANSP_OPAQUE, \
+ _TRANSP_TRANSPARENT, schema
from txdav.common.icommondatastore import IndexedSearchException, \
InternalDataStoreError, HomeChildNameAlreadyExistsError, \
HomeChildNameNotAllowedError, ObjectResourceTooBigError, \
@@ -1755,55 +1754,7 @@
#===============================================================================
# Group sharing
#===============================================================================
- @inlineCallbacks
- def shareWithUID(self, shareeUID, mode, status=None, summary=None, shareName=None):
- """
- Share this (owned) L{CommonHomeChild} with another principal.
- @param shareeUID: The UID of the sharee.
- @type: L{str}
-
- @param mode: The sharing mode; L{_BIND_MODE_READ} or
- L{_BIND_MODE_WRITE} or L{_BIND_MODE_DIRECT}
- @type mode: L{str}
-
- @param status: The sharing status; L{_BIND_STATUS_INVITED} or
- L{_BIND_STATUS_ACCEPTED}
- @type: L{str}
-
- @param summary: The proposed message to go along with the share, which
- will be used as the default display name.
- @type: L{str}
-
- @return: the name of the shared calendar in the new calendar home.
- @rtype: L{str}
- """
- record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
- if (
- record is None or
- record.type() != RecordType.group or not (False and
- config.Sharing.Enabled and
- config.Sharing.Calendars.Enabled and
- config.Sharing.Calendars.Groups.Enabled
- )
- ):
- shareeHome = yield self._txn.calendarHomeWithUID(shareeUID, create=True)
- returnValue(
- (yield self.shareWith(shareeHome, mode, status, summary, shareName))
- )
-
- # shareWith every member of group not already shared to
- groupID = (yield self._txn.groupByUID(record.uid))[0]
- memberUIDs = yield self._txn.groupMemberUIDs(groupID)
- for memberUID in memberUIDs:
- shareeHome = yield self._txn.calendarHomeWithUID(memberUID, create=True)
- if (yield shareeHome.childWithID(self._resourceID)) is None:
- yield self.shareWith(shareeHome, _BIND_MODE_GROUP, status)
-
- yield self.updateShareeGroupLink(shareeUID, mode)
- returnValue(None)
-
-
@inlineCallbacks
def reconcileGroupSharee(self, groupUID):
"""
@@ -1823,8 +1774,10 @@
[bind.HOME_RESOURCE_ID],
From=bind,
Where=bind.CALENDAR_RESOURCE_ID == self._resourceID.And(
- bind.BIND_MODE == _BIND_MODE_GROUP
- ),
+ (bind.BIND_MODE == _BIND_MODE_GROUP).Or(
+ bind.BIND_MODE == _BIND_MODE_GROUP_READ).Or(
+ bind.BIND_MODE == _BIND_MODE_GROUP_WRITE)
+ )
).on(self._txn)
groupShareeHomeIDs = [row[0] for row in rows]
for groupShareeHomeID in groupShareeHomeIDs:
@@ -1832,20 +1785,65 @@
if shareeHome.uid() in memberUIDs:
boundUIDs.add(shareeHome.uid())
else:
- shareeView = yield shareeHome.childWithID(self._resourceID)
- yield self.removeShare(shareeView)
+ yield self.uninviteUIDFromShare(shareeHome.uid())
changed = True
for memberUID in memberUIDs - boundUIDs:
- shareeHome = yield self._txn.calendarHomeWithUID(memberUID, create=True)
- if (yield shareeHome.childWithID(self._resourceID)) is None:
- yield self.shareWith(shareeHome, _BIND_MODE_GROUP)
+ shareeView = yield self.shareeView(memberUID)
+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
+ if newMode is not None:
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
changed = True
returnValue(changed)
+ def groupModeAfterAddingOneGroupSharee(self):
+ """
+ return group mode after adding one group sharee or None
+ """
+ return {
+ _BIND_MODE_GROUP: _BIND_MODE_GROUP,
+ _BIND_MODE_READ: _BIND_MODE_GROUP_READ,
+ _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP_READ,
+ _BIND_MODE_WRITE: _BIND_MODE_GROUP_WRITE,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP_WRITE,
+ }.get(self.shareMode())
+
+
@inlineCallbacks
+ def groupModeAfterRemovingOneGroupSharee(self):
+ """
+ return group mode after removing one group sharee or None
+ """
+ # if more than one group
+ gs = schema.GROUP_SHAREE
+ rows = yield Select(
+ [Count(gs.GROUP_ID)],
+ From=gs,
+ Where=(gs.CALENDAR_HOME_ID == self.ownerHome()._resourceID).And(
+ gs.CALENDAR_ID == self._resourceID)
+ ).on(self._txn)
+ if rows[0][0] > 1:
+ # no mode change for group shares
+ returnValue(
+ {
+ _BIND_MODE_GROUP: _BIND_MODE_GROUP,
+ _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP_READ,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP_WRITE,
+ }.get(self.shareMode())
+ )
+
+ # else return mode without any groups
+ returnValue(
+ {
+ _BIND_MODE_GROUP_READ: _BIND_MODE_READ,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_WRITE,
+ }.get(self.shareMode())
+ )
+
+
+ @inlineCallbacks
def updateShareeGroupLink(self, groupUID, mode=None):
"""
update schema.GROUP_SHAREE
@@ -1893,102 +1891,33 @@
returnValue(changed)
- @inlineCallbacks
def effectiveShareMode(self):
- if self._bindMode == _BIND_MODE_GROUP:
+ return self._effectiveShareMode(
+ self._bindMode, self.ownerHome()._resourceID,
+ self._resourceID, self._txn
+ )
+
+
+ @classmethod
+ @inlineCallbacks
+ def _effectiveShareMode(cls, bindMode, homeID, childID, txn):
+ if bindMode == _BIND_MODE_GROUP_WRITE:
+ returnValue(_BIND_MODE_WRITE)
+ elif bindMode in (_BIND_MODE_GROUP, _BIND_MODE_GROUP_READ):
gs = schema.GROUP_SHAREE
rows = yield Select(
[Max(gs.GROUP_BIND_MODE)], # _BIND_MODE_WRITE > _BIND_MODE_READ
From=gs,
- Where=(gs.CALENDAR_HOME_ID == self.ownerHome()._resourceID).And(
- gs.CALENDAR_ID == self._resourceID
+ Where=(gs.CALENDAR_HOME_ID == homeID).And(
+ gs.CALENDAR_ID == childID
)
- ).on(self._txn)
+ ).on(txn)
groupShareMode = rows[0][0]
returnValue(groupShareMode)
else:
- returnValue(self._bindMode)
+ returnValue(bindMode)
- @inlineCallbacks
- def removeShare(self, shareeView):
- """
- Remove the shared version of this (owned) L{CommonHomeChild} from the
- referenced L{CommonHome}.
-
- If user share and user is in shared group, change to group share.
-
- @see: L{CommonHomeChild.shareWith}
-
- @param shareeView: The shared resource being removed.
-
- @return: a L{Deferred} which will fire with the previous shareUID
- """
-
- # see if after share is removed, user is still shared by a group sharee
- if shareeView.shareMode() in (_BIND_MODE_DIRECT, _BIND_MODE_READ, _BIND_MODE_WRITE, _BIND_MODE_GROUP):
-
- gs = schema.GROUP_SHAREE
- rows = yield Select(
- [gs.GROUP_ID],
- From=gs,
- Where=(gs.CALENDAR_HOME_ID == self.ownerHome()._resourceID).And(
- gs.CALENDAR_ID == self._resourceID)
- ).on(self._txn)
- groupIDs = [row[0] for row in rows]
-
- shareeHomeUID = shareeView.viewerHome().uid()
- for groupID in groupIDs:
- memberUIDs = yield self._txn.groupMemberUIDs(groupID) # must be cached
- if shareeHomeUID in memberUIDs:
- yield self.updateShare(shareeView, mode=_BIND_MODE_GROUP)
- returnValue(None)
-
- # no group sharee for this user so let super do work
- returnValue((yield super(Calendar, self).removeShare(shareeView)))
-
- #TODO: effectiveShareMode may change between _BIND_MODE_READ & _BIND_MODE_READ.
- # Is that OK?
-
-
- @inlineCallbacks
- def removeShareWithUID(self, shareeUID):
- """
- Unshare this (owned) L{CommonHomeChild} with another principal.
-
- @param shareeUID: The UID of the sharee.
- @type: L{str}
- """
- record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
- if (
- record is None or
- record.recordType != RecordType.group or not (False and
- config.Sharing.Enabled and
- config.Sharing.Calendars.Enabled and
- config.Sharing.Calendars.Groups.Enabled
- )
- ):
- returnValue(None)
-
- # get group membership
- groupID = (yield self._txn.groupByUID(record.uid))[0]
- memberUIDs = yield self._txn.groupMemberUIDs(groupID)
-
- # update groupsharee so that removeShare works
- gs = schema.GROUP_SHAREE
- yield Delete(
- From=gs,
- Where=(gs.CALENDAR_HOME_ID == self.ownerHome()._resourceID).And(
- gs.CALENDAR_ID == self._resourceID).And(
- gs.GROUP_ID == groupID)
- ).on(self._txn)
-
- for memberUID in memberUIDs:
- shareeHome = yield self._txn.calendarHomeWithUID(memberUID, create=True)
- shareeView = yield shareeHome.childWithID(self._resourceID)
- yield self.removeShare(shareeView)
-
-
#
# Higher level API
#
@@ -2009,7 +1938,7 @@
record = yield self._txn.directoryService().recordWithUID(shareeUID.decode("utf-8"))
if (
record is None or
- record.type() != RecordType.group or not (False and
+ record.recordType != RecordType.group or not (False and
config.Sharing.Enabled and
config.Sharing.Calendars.Enabled and
config.Sharing.Calendars.Groups.Enabled
@@ -2024,9 +1953,9 @@
memberUIDs = yield self._txn.groupMemberUIDs(groupID)
for memberUID in memberUIDs:
shareeView = yield self.shareeView(shareeUID)
- if shareeView is None:
- yield super(Calendar, self).inviteUIDToShare(memberUID, _BIND_MODE_GROUP, summary, shareName)
- # FIX ME:
+ newMode = _BIND_MODE_GROUP if shareeView is None else shareeView.groupModeAfterAddingOneGroupSharee()
+ if newMode is not None:
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
returnValue(None)
@@ -2069,19 +1998,12 @@
shareeView = yield self.shareeView(shareeUID)
if shareeView is not None:
- if shareeView.viewerHome().external():
- yield self._sendExternalUninvite(shareeView)
+ newMode = yield shareeView.groupModeAfterRemovingOneGroupSharee()
+ if newMode is None:
+ yield super(Calendar, self).uninviteUIDFromShare(shareeUID)
else:
- # If current user state is accepted then we send an invite with the new state, otherwise
- # we cancel any existing invites for the user
- if not shareeView.direct():
- if shareeView.shareStatus() != _BIND_STATUS_ACCEPTED:
- yield self._removeInviteNotification(shareeView)
- else:
- yield self._sendInviteNotification(shareeView, notificationState=_BIND_STATUS_DELETED)
+ yield super(Calendar, self).inviteUIDToShare(shareeUID, newMode)
- # Remove the bind
- yield self.removeShare(shareeView)
icalfbtype_to_indexfbtype = {
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-09 00:54:03 UTC (rev 13736)
@@ -61,12 +61,12 @@
from txdav.carddav.iaddressbookstore import IAddressBookTransaction
from txdav.common.datastore.common import HomeChildBase
from txdav.common.datastore.podding.conduit import PoddingConduit
-from txdav.common.datastore.sql_tables import _BIND_MODE_OWN, \
- _BIND_STATUS_ACCEPTED, _BIND_STATUS_DECLINED, _BIND_STATUS_INVALID, \
- _BIND_STATUS_INVITED, _BIND_MODE_DIRECT, _BIND_STATUS_DELETED, \
- _BIND_MODE_INDIRECT, _HOME_STATUS_NORMAL, _HOME_STATUS_EXTERNAL, \
- _HOME_STATUS_PURGING
-from txdav.common.datastore.sql_tables import schema, splitSQLString
+from txdav.common.datastore.sql_tables import _BIND_MODE_DIRECT, \
+ _BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE, \
+ _BIND_MODE_INDIRECT, _BIND_MODE_OWN, _BIND_STATUS_ACCEPTED, \
+ _BIND_STATUS_DECLINED, _BIND_STATUS_DELETED, _BIND_STATUS_INVALID, \
+ _BIND_STATUS_INVITED, _HOME_STATUS_EXTERNAL, _HOME_STATUS_NORMAL, \
+ _HOME_STATUS_PURGING, schema, splitSQLString
from txdav.common.icommondatastore import ConcurrentModification, \
RecordNotAllowedError, ExternalShareFailed, ShareNotAllowed, \
IndexedSearchException, NotFoundError
@@ -81,7 +81,6 @@
from txdav.common.inotifications import INotificationCollection, \
INotificationObject
from txdav.idav import ChangeCategory
-from twext.who.idirectory import RecordType
from txdav.xml import element
from uuid import uuid4, UUID
@@ -4563,7 +4562,7 @@
# Higher level API
#
@inlineCallbacks
- def inviteUIDToShare(self, shareeUID, mode, summary, shareName=None):
+ def inviteUIDToShare(self, shareeUID, mode, summary=None, shareName=None):
"""
Invite a user to share this collection - either create the share if it does not exist, or
update the existing share with new values. Make sure a notification is sent as well.
@@ -5028,16 +5027,18 @@
#remove None parameters, and substitute None for empty string
bind = self._bindSchema
- columnMap = dict([(k, v if v != "" else None) for k, v in {
- bind.BIND_MODE:mode,
- bind.BIND_STATUS:status,
- bind.MESSAGE:summary
- }.iteritems() if v is not None])
+ columnMap = {}
+ if mode != None and mode != self._bindMode:
+ columnMap[bind.BIND_MODE] = mode
+ if status != None:# and status != self._bindStatus: # FIXME:
+ columnMap[bind.BIND_STATUS] = status
+ if summary != None and summary and summary != self._bindMessage:
+ columnMap[bind.MESSAGE] = summary
if columnMap:
# Count accepted
- if status is not None:
+ if bind.BIND_STATUS in columnMap:
previouslyAcceptedCount = yield shareeView._previousAcceptCount()
yield self._updateBindColumnsQuery(columnMap).on(
@@ -5142,12 +5143,20 @@
returnValue([])
# get all accepted binds
- acceptedRows = yield self._sharedInvitationBindForResourceID.on(
+ invitedRows = yield self._sharedInvitationBindForResourceID.on(
self._txn, resourceID=self._resourceID, homeID=self._home._resourceID
)
result = []
- for homeUID, homeRID, _ignore_resourceID, resourceName, bindMode, bindStatus, bindMessage in acceptedRows:
+ for homeUID, homeRID, _ignore_resourceID, resourceName, bindMode, bindStatus, bindMessage in invitedRows:
+
+ # performance optimzation: don't instantiate viewer or viewer home
+ if bindMode in (_BIND_MODE_GROUP, _BIND_MODE_GROUP_READ, _BIND_MODE_GROUP_WRITE):
+ bindMode = yield self._effectiveShareMode(
+ bindMode, homeRID,
+ self._resourceID, self._txn
+ )
+
invite = SharingInvitation(
resourceName,
self.ownerHome().name(),
@@ -5283,6 +5292,11 @@
return self._bindMode
+ @classmethod
+ def _effectiveShareMode(cls, bindMode, homeID, childID, txn):
+ return bindMode
+
+
def shareName(self):
"""
This is a path like name for the resource within the home being shared. For object resource
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-07-09 00:54:03 UTC (rev 13736)
@@ -117,6 +117,8 @@
insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('direct', 3);
insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('indirect', 4);
insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group', 5);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group,read', 6);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group,write', 7);
create table CALENDAR_BIND_STATUS (
"ID" integer primary key,
"DESCRIPTION" nvarchar2(16) unique
@@ -595,7 +597,7 @@
"VALUE" nvarchar2(255)
);
-insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '45');
+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '46');
insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
@@ -765,7 +767,7 @@
JOB_ID
);
-create index GROUP_ATTENDEE_ID_d497ffdb on GROUP_ATTENDEE (
+create index GROUP_ATTENDEE_RESOUR_855124dc on GROUP_ATTENDEE (
RESOURCE_ID
);
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current.sql 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/current.sql 2014-07-09 00:54:03 UTC (rev 13736)
@@ -205,6 +205,8 @@
insert into CALENDAR_BIND_MODE values (3, 'direct');
insert into CALENDAR_BIND_MODE values (4, 'indirect');
insert into CALENDAR_BIND_MODE values (5, 'group');
+insert into CALENDAR_BIND_MODE values (6, 'group,read');
+insert into CALENDAR_BIND_MODE values (7, 'group,write');
-- Enumeration of statuses
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_45_to_46.sql
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_45_to_46.sql 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_45_to_46.sql 2014-07-09 00:54:03 UTC (rev 13736)
@@ -19,7 +19,10 @@
---------------------------------------------------
insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group', 5);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group,read', 6);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group,write', 7);
+
create table GROUP_SHAREE_RECONCILE_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
JOB_ID integer not null references JOB,
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_45_to_46.sql
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_45_to_46.sql 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_45_to_46.sql 2014-07-09 00:54:03 UTC (rev 13736)
@@ -19,7 +19,10 @@
---------------------------------------------------
insert into CALENDAR_BIND_MODE values (5, 'group');
+insert into CALENDAR_BIND_MODE values (6, 'group,read');
+insert into CALENDAR_BIND_MODE values (7, 'group,write');
+
create table GROUP_SHAREE_RECONCILE_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
JOB_ID integer not null references JOB,
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py 2014-07-08 20:21:56 UTC (rev 13735)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql_tables.py 2014-07-09 00:54:03 UTC (rev 13736)
@@ -231,6 +231,8 @@
_BIND_MODE_DIRECT = _bindMode('direct')
_BIND_MODE_INDIRECT = _bindMode('indirect')
_BIND_MODE_GROUP = _bindMode('group')
+_BIND_MODE_GROUP_READ = _bindMode('group,read')
+_BIND_MODE_GROUP_WRITE = _bindMode('group,write')
_addressBookObjectKind = _schemaConstants(
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140708/9a84c03a/attachment-0001.html>
More information about the calendarserver-changes
mailing list