<!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>[13748] CalendarServer/branches/users/gaya/groupsharee2/txdav</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/13748">13748</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-07-10 17:17:43 -0700 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>only use effectiveShareMode() for notifications and access privs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py (13747 => 13748)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-10 23:30:57 UTC (rev 13747)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/caldav/datastore/sql.py 2014-07-11 00:17:43 UTC (rev 13748)
</span><span class="lines">@@ -1754,7 +1754,6 @@
</span><span class="cx"> #===============================================================================
</span><span class="cx"> # Group sharing
</span><span class="cx"> #===============================================================================
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def reconcileGroupSharee(self, groupUID):
</span><span class="cx"> """
</span><span class="lines">@@ -1891,31 +1890,23 @@
</span><span class="cx"> returnValue(changed)
</span><span class="cx">
</span><span class="cx">
</span><del>- def effectiveShareMode(self):
- return self._effectiveShareMode(
- self._bindMode, self.ownerHome()._resourceID,
- self._resourceID, self._txn
- )
-
-
- @classmethod
</del><span class="cx"> @inlineCallbacks
</span><del>- def _effectiveShareMode(cls, bindMode, homeID, childID, txn):
- if bindMode == _BIND_MODE_GROUP_WRITE:
</del><ins>+ def effectiveShareMode(self):
+ if self._bindMode == _BIND_MODE_GROUP_WRITE:
</ins><span class="cx"> returnValue(_BIND_MODE_WRITE)
</span><del>- elif bindMode in (_BIND_MODE_GROUP, _BIND_MODE_GROUP_READ):
</del><ins>+ elif self._bindMode in (_BIND_MODE_GROUP, _BIND_MODE_GROUP_READ):
</ins><span class="cx"> gs = schema.GROUP_SHAREE
</span><span class="cx"> rows = yield Select(
</span><span class="cx"> [Max(gs.GROUP_BIND_MODE)], # _BIND_MODE_WRITE > _BIND_MODE_READ
</span><span class="cx"> From=gs,
</span><del>- Where=(gs.CALENDAR_HOME_ID == homeID).And(
- gs.CALENDAR_ID == childID
</del><ins>+ Where=(gs.CALENDAR_HOME_ID == self.ownerHome()._resourceID).And(
+ gs.CALENDAR_ID == self._resourceID
</ins><span class="cx"> )
</span><del>- ).on(txn)
</del><ins>+ ).on(self._txn)
</ins><span class="cx"> groupShareMode = rows[0][0]
</span><span class="cx"> returnValue(groupShareMode)
</span><span class="cx"> else:
</span><del>- returnValue(bindMode)
</del><ins>+ returnValue(self._bindMode)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="CalendarServerbranchesusersgayagroupsharee2txdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py (13747 => 13748)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-10 23:30:57 UTC (rev 13747)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/common/datastore/sql.py 2014-07-11 00:17:43 UTC (rev 13748)
</span><span class="lines">@@ -4749,7 +4749,7 @@
</span><span class="cx"> "sharee": shareeView.viewerHome().uid(),
</span><span class="cx"> "uid": shareeView.shareUID(),
</span><span class="cx"> "status": shareeView.shareStatus() if notificationState is None else notificationState,
</span><del>- "access": shareeView.shareMode(),
</del><ins>+ "access": (yield shareeView.effectiveShareMode()),
</ins><span class="cx"> "ownerName": self.shareName(),
</span><span class="cx"> "summary": displayname,
</span><span class="cx"> }
</span><span class="lines">@@ -5149,14 +5149,6 @@
</span><span class="cx">
</span><span class="cx"> result = []
</span><span class="cx"> for homeUID, homeRID, _ignore_resourceID, resourceName, bindMode, bindStatus, bindMessage in invitedRows:
</span><del>-
- # 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
- )
-
</del><span class="cx"> invite = SharingInvitation(
</span><span class="cx"> resourceName,
</span><span class="cx"> self.ownerHome().name(),
</span><span class="lines">@@ -5292,11 +5284,6 @@
</span><span class="cx"> return self._bindMode
</span><span class="cx">
</span><span class="cx">
</span><del>- @classmethod
- def _effectiveShareMode(cls, bindMode, homeID, childID, txn):
- return bindMode
-
-
</del><span class="cx"> def shareName(self):
</span><span class="cx"> """
</span><span class="cx"> This is a path like name for the resource within the home being shared. For object resource
</span></span></pre>
</div>
</div>
</body>
</html>