<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13898] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13898">13898</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 17:13:58 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix uninviteUIDFromShare(), require CalDAVTester <a href="http://trac.calendarserver.org//changeset/13897">r13897</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13897 => 13898)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt        2014-08-19 23:43:21 UTC (rev 13897)
+++ CalendarServer/trunk/requirements-dev.txt        2014-08-20 00:13:58 UTC (rev 13898)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13893#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13897#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (13897 => 13898)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-08-19 23:43:21 UTC (rev 13897)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-08-20 00:13:58 UTC (rev 13898)
</span><span class="lines">@@ -1886,25 +1886,24 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> ).on(self._txn, uid=self.viewerHome().uid())
</span><del>- if rows[0][0] > 0:
</del><ins>+ if rows[0][0] > 1:
</ins><span class="cx"> # no mode change for group shares
</span><del>- 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._bindMode)
- )
</del><ins>+ result = {
+ _BIND_MODE_GROUP: _BIND_MODE_GROUP,
+ _BIND_MODE_GROUP_READ: _BIND_MODE_GROUP_READ,
+ _BIND_MODE_GROUP_WRITE: _BIND_MODE_GROUP_WRITE,
+ }.get(self._bindMode)
</ins><span class="cx">
</span><del>- # else return mode without any groups
- returnValue(
- {
</del><ins>+ else:
+ # return mode without any groups
+ result = {
</ins><span class="cx"> _BIND_MODE_GROUP_READ: _BIND_MODE_READ,
</span><span class="cx"> _BIND_MODE_GROUP_WRITE: _BIND_MODE_WRITE,
</span><span class="cx"> }.get(self._bindMode)
</span><del>- )
</del><span class="cx">
</span><ins>+ returnValue(result)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def updateShareeGroupLink(self, groupUID, mode=None):
</span><span class="cx"> """
</span><span class="lines">@@ -2073,22 +2072,20 @@
</span><span class="cx"> @type shareeUID: C{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # see if group sharee for self & delete
- gr = schema.GROUPS
- gs = schema.GROUP_SHAREE
- rows = yield Delete(
- From=gs,
- Where=(gs.CALENDAR_ID == self._resourceID).And(
- gs.GROUP_ID == Select(
- [gr.GROUP_ID],
- From=gr,
- Where=(gr.GROUP_UID == shareeUID)
- )
- ),
- Return=[gs.GROUP_ID]
- ).on(self._txn)
</del><ins>+ rows = None
+ groupID = (yield self._txn.groupByUID(shareeUID, create=False))[0]
+ if groupID is not None:
+ gs = schema.GROUP_SHAREE
+ rows = yield Select(
+ [gs.GROUP_ID],
+ From=gs,
+ Where=(gs.CALENDAR_ID == self._resourceID).And(
+ gs.GROUP_ID == groupID
+ ),
+ ).on(self._txn)
</ins><span class="cx">
</span><span class="cx"> if rows:
</span><ins>+ reinvites = []
</ins><span class="cx"> # uninvite each member of group
</span><span class="cx"> memberUIDs = yield self._txn.groupMemberUIDs(rows[0][0])
</span><span class="cx"> for memberUID in memberUIDs:
</span><span class="lines">@@ -2101,9 +2098,21 @@
</span><span class="cx"> # one group or individual share: delete share
</span><span class="cx"> yield super(Calendar, self).uninviteUIDFromShare(memberUID)
</span><span class="cx"> else:
</span><del>- # multiple groups or group and individual was shared, update to new mode
- yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
</del><ins>+ # multiple groups or group and individual was shared add to reinvite list to update
+ reinvites.append((memberUID, newMode))
</ins><span class="cx">
</span><ins>+ # Delete before super.inviteUIDTOShare() and after super.inviteUIDToShare() so notification has correct access mode
+ yield Delete(
+ From=gs,
+ Where=(gs.CALENDAR_ID == self._resourceID).And(
+ gs.GROUP_ID == groupID
+ ),
+ ).on(self._txn)
+
+ for memberUID, newMode in reinvites:
+ shareeView = yield self.shareeView(memberUID)
+ yield super(Calendar, self).inviteUIDToShare(memberUID, newMode)
+
</ins><span class="cx"> else:
</span><span class="cx"> shareeView = yield self.shareeView(shareeUID)
</span><span class="cx"> if shareeView is not None:
</span></span></pre>
</div>
</div>
</body>
</html>