<!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>[14655] 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/14655">14655</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-03 09:55:52 -0700 (Fri, 03 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix for CDT+trash. Make sure group attendee link is removed when event put in the trash. Make sure a cancel of an already trashed event does not result in an inbox item.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingworkpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py</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 (14654 => 14655)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-04-03 16:53:50 UTC (rev 14654)
+++ CalendarServer/trunk/requirements-dev.txt 2015-04-03 16:55:52 UTC (rev 14655)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</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@14644#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14654#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (14654 => 14655)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-03 16:53:50 UTC (rev 14654)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-03 16:55:52 UTC (rev 14655)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx"> if calendar_resource:
</span><span class="cx"> self.recipient_calendar = (yield calendar_resource.componentForUser(self.recipient.record.uid)).duplicate()
</span><span class="cx"> self.recipient_calendar_resource = calendar_resource
</span><ins>+ self.recipient_in_trash = (yield self.recipient_calendar_resource.isInTrash())
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -339,6 +340,7 @@
</span><span class="cx"> # If we get a CANCEL and we don't have a matching resource already stored, simply
</span><span class="cx"> # ignore the CANCEL.
</span><span class="cx"> if self.new_resource and self.method == "CANCEL":
</span><ins>+ log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring METHOD:CANCEL, UID: '%s' - attendee has no copy" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</ins><span class="cx"> result = (True, True, False, None)
</span><span class="cx"> else:
</span><span class="cx"> result = (yield self.doImplicitAttendeeUpdate())
</span><span class="lines">@@ -365,8 +367,8 @@
</span><span class="cx"> if not (existing_organizer == "" and self.originator.hosted()):
</span><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring UID: '%s' - organizer has no copy" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx"> # If the recipient copy is in the trash, just remove it
</span><del>- if (yield self.recipient_calendar_resource.isInTrash()):
- yield self.recipient_calendar_resource.remove(bypassTrash=True)
</del><ins>+ if self.recipient_in_trash:
+ yield self.deleteCalendarResource(self.recipient_calendar_resource)
</ins><span class="cx"> # Reset state to make it look like a new iTIP being processed
</span><span class="cx"> self.recipient_calendar = None
</span><span class="cx"> self.recipient_calendar_resource = None
</span><span class="lines">@@ -385,7 +387,7 @@
</span><span class="cx"> yield self.recipient_calendar_resource.parentCollection()._createCalendarObjectWithNameInternal(name, changed_calendar, ComponentUpdateState.RAW)
</span><span class="cx">
</span><span class="cx"> # Delete the original resource
</span><del>- yield self.recipient_calendar_resource.remove(implicitly=False, bypassTrash=True)
</del><ins>+ yield self.deleteCalendarResource(self.recipient_calendar_resource)
</ins><span class="cx">
</span><span class="cx"> # Reset state to make it look like a new iTIP being processed
</span><span class="cx"> self.recipient_calendar = None
</span><span class="lines">@@ -545,8 +547,7 @@
</span><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' processing METHOD:REQUEST, UID: '%s' - updating event" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx">
</span><span class="cx"> # Only move from trash if attendee is not fully declined:
</span><del>- isInTrash = yield self.recipient_calendar_resource.isInTrash()
- if isInTrash:
</del><ins>+ if self.recipient_in_trash:
</ins><span class="cx"> attendees = self.message.getAttendeeProperties((self.recipient.cuaddr,))
</span><span class="cx"> if not all([attendee.parameterValue("PARTSTAT", "NEEDS-ACTION") == "DECLINED" for attendee in attendees]):
</span><span class="cx"> yield self.recipient_calendar_resource.fromTrash()
</span><span class="lines">@@ -606,10 +607,16 @@
</span><span class="cx"> @return: C{tuple} of (processed, auto-processed, store inbox item, changes)
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # If there is no existing copy, then ignore
- if self.recipient_calendar is None:
- log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring METHOD:CANCEL, UID: '%s' - attendee has no copy" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
- result = (True, False, True, None)
</del><ins>+ # Note that we never get here if there is no existing copy, i.e., self.new_resource is True, because that case is handled directly in
+ # self.doImplicitAttendee().
+
+ # If there attendee copy is in the trash, then we should remove the trash item and not store an inbox item as there is no reason to recover
+ # the cancelled meeting.
+ if self.recipient_in_trash:
+ # Note we should never get here as this test is
+ log.debug("ImplicitProcessing - originator '%s' to recipient '%s' ignoring METHOD:CANCEL, UID: '%s' - attendee copy in trash" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
+ yield self.deleteCalendarResource(self.recipient_calendar_resource)
+ result = (True, True, False, None)
</ins><span class="cx"> else:
</span><span class="cx"> # Need to check for auto-respond attendees. These need to suppress the inbox message
</span><span class="cx"> # if the cancel is processed. However, if the principal is a user we always force the
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py (14654 => 14655)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py 2015-04-03 16:53:50 UTC (rev 14654)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py 2015-04-03 16:55:52 UTC (rev 14655)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> raise
</span><span class="cx">
</span><span class="cx"> log.debug(
</span><del>- "ScheduleOrganizerSendWork - for ID: {id}, UID: {uid}, organizer: {org}, attendee: {att}",
</del><ins>+ "ScheduleOrganizerSendWork - done for ID: {id}, UID: {uid}, organizer: {org}, attendee: {att}",
</ins><span class="cx"> id=self.workID,
</span><span class="cx"> uid=self.icalendarUID,
</span><span class="cx"> org=organizer,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14654 => 14655)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-03 16:53:50 UTC (rev 14654)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-04-03 16:55:52 UTC (rev 14655)
</span><span class="lines">@@ -4170,6 +4170,9 @@
</span><span class="cx"> if bypassTrash:
</span><span class="cx"> yield super(CalendarObject, self).reallyRemove()
</span><span class="cx"> else:
</span><ins>+ # Always remove the group attendee link to prevent trashed items from being reconciled when a group changes
+ yield GroupAttendeeRecord.deletesimple(self._txn, resourceID=self._resourceID)
+
</ins><span class="cx"> yield super(CalendarObject, self).remove()
</span><span class="cx">
</span><span class="cx"> # Do scheduling
</span></span></pre>
</div>
</div>
</body>
</html>