<!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>[9482] CalendarServer/branches/users/gaya/inviteclean</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.macosforge.org/projects/calendarserver/changeset/9482">9482</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2012-07-23 15:39:02 -0700 (Mon, 23 Jul 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>some minor edits from discussion session with bruce</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayainvitecleantxdavcommondatastoresqlpy">CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServerbranchesusersgayainviteclean">CalendarServer/branches/users/gaya/inviteclean/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersgayainvitecleantxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py (9481 => 9482)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py        2012-07-23 20:44:44 UTC (rev 9481)
+++ CalendarServer/branches/users/gaya/inviteclean/txdav/common/datastore/sql.py        2012-07-23 22:39:02 UTC (rev 9482)
</span><span class="lines">@@ -2197,15 +2197,14 @@
</span><span class="cx">         returnValue(homeChild)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><del>-    def updateShare(self, homeChild, mode, status, message):
</del><ins>+    def updateShare(self, shareeView, mode, status, message):
</ins><span class="cx">         &quot;&quot;&quot;
</span><del>-        Update share mode, status, and message for a home child
-            shared with this (owned) L{CommonHomeChild].
</del><ins>+        Update share mode, status, and message for a home child shared with
+        this (owned) L{CommonHomeChild}.
</ins><span class="cx"> 
</span><del>-        @param shared: The sharee home child that shares this.
-        @type shareeHome: L{CommonHomeChild}
</del><ins>+        @param shareeView: The sharee home child that shares this.
+        @type shareeView: L{CommonHomeChild}
</ins><span class="cx"> 
</span><span class="cx">         @param mode: The sharing mode; L{_BIND_MODE_READ} or
</span><span class="cx">             L{_BIND_MODE_WRITE}.
</span><span class="lines">@@ -2213,13 +2212,17 @@
</span><span class="cx">         @param status: The sharing mode; L{_BIND_STATUS_INVITED} or
</span><span class="cx">             L{_BIND_STATUS_ACCEPTED} or L{_BIND_STATUS_DECLINED} or
</span><span class="cx">             L{_BIND_STATUS_INVALID}.
</span><ins>+
</ins><span class="cx">         @type mode: L{str}
</span><span class="cx"> 
</span><del>-        @param message: The proposed share name
-        @type recipient: L{str}
</del><ins>+        @param message: The proposed message to go along with the share, which
+            will be used as the default display name.
</ins><span class="cx"> 
</span><span class="cx">         @return: L{Deferred}
</span><span class="cx">         &quot;&quot;&quot;
</span><ins>+        # TODO: raise a nice exception if shareeView is not, in fact, a shared
+        # version of this same L{CommonHomeChild}
+
</ins><span class="cx">         # yield self.shareWith(shared._home, mode, status, message)
</span><span class="cx">         dn = PropertyName.fromElement(DisplayName)
</span><span class="cx">         dnprop = (self.properties().get(dn) or
</span><span class="lines">@@ -2228,10 +2231,10 @@
</span><span class="cx">         yield self._updateBindQuery.on(
</span><span class="cx">             self._txn,
</span><span class="cx">             mode=mode, status=status, message=message,
</span><del>-            resourceID=self._resourceID, homeID=homeChild._home._resourceID
</del><ins>+            resourceID=self._resourceID, homeID=shareeView._home._resourceID
</ins><span class="cx">         )
</span><span class="cx"> 
</span><del>-        shareeProps = yield PropertyStore.load(homeChild._home.uid(), self._txn,
</del><ins>+        shareeProps = yield PropertyStore.load(shareeView._home.uid(), self._txn,
</ins><span class="cx">                                                self._resourceID)
</span><span class="cx">         shareeProps[dn] = dnprop
</span><span class="cx">         
</span><span class="lines">@@ -2239,9 +2242,9 @@
</span><span class="cx">         yield self.notifyChanged()
</span><span class="cx">         
</span><span class="cx">         #update affected attributes
</span><del>-        homeChild._bindMode = mode
-        homeChild._bindStatus = status
-        homeChild._bindMessage = message
</del><ins>+        shareeView._bindMode = mode
+        shareeView._bindStatus = status
+        shareeView._bindMessage = message
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="lines">@@ -2372,7 +2375,6 @@
</span><span class="cx"> 
</span><span class="cx">     @classproperty
</span><span class="cx">     def _allInvitedQuery(cls): #@NoSelf
</span><del>-        
</del><span class="cx">         #FIXME performance: change schema to get rid if INVITE table -&gt; no join
</span><span class="cx">         #
</span><span class="cx">         # similar to sql_legacy.py
</span><span class="lines">@@ -2391,26 +2393,13 @@
</span><span class="cx">                 (inv.RESOURCE_ID == Parameter(&quot;resourceID&quot;))
</span><span class="cx">                 .And(inv.RESOURCE_ID == bind.RESOURCE_ID)
</span><span class="cx">                 .And(inv.HOME_RESOURCE_ID == home.RESOURCE_ID)
</span><del>-                .And(inv.HOME_RESOURCE_ID == bind.HOME_RESOURCE_ID))
-        )
-        '''
-        # The ALMOST worked, but returns too many rows in some cases.  
-        inv = schema.INVITE
-        bind = cls._bindSchema
-        return Select(
-            [bind.BIND_MODE, 
-             bind.HOME_RESOURCE_ID,
-             bind.RESOURCE_NAME,    # same as inv.INVITE_UID when not accepted
-             bind.BIND_STATUS,
-             bind.MESSAGE,
-             inv.INVITE_UID],
-            From=inv.join(bind),
-            Where=(bind.RESOURCE_ID == Parameter(&quot;resourceID&quot;))
</del><span class="cx">                 .And(inv.HOME_RESOURCE_ID == bind.HOME_RESOURCE_ID)
</span><del>-                .And(bind.BIND_MODE != _BIND_MODE_OWN)
</del><ins>+                # FIXME: test that this next line effectively obscures already-
+                # accepted and owned stuff!
+                .And(bind.BIND_STATUS != _BIND_STATUS_ACCEPTED))
</ins><span class="cx">         )
</span><del>-        '''
</del><span class="cx"> 
</span><ins>+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def asInvited(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -2427,7 +2416,7 @@
</span><span class="cx">             self._txn, resourceID=self._resourceID
</span><span class="cx">         )
</span><span class="cx">         cls = self.__class__ # for ease of grepping...
</span><del>-        
</del><ins>+
</ins><span class="cx">         result = []
</span><span class="cx">         for bindMode, homeResourceID, sharedResourceName, bindStatus, bindMessage, inviteUID in rows:
</span><span class="cx">             # TODO: this could all be issued in parallel; no need to serialize
</span></span></pre>
</div>
</div>

</body>
</html>