<!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>[14662] CalendarServer/trunk/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/14662">14662</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-06 09:44:14 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure inconsequential change to item in trash leaves it in the trash.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_trashpy">CalendarServer/trunk/txdav/common/datastore/test/test_trash.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingprocessingpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py (14661 => 14662)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-04 18:06:01 UTC (rev 14661)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/processing.py 2015-04-06 16:44:14 UTC (rev 14662)
</span><span class="lines">@@ -372,6 +372,7 @@
</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="cx"> self.recipient_calendar_resource = None
</span><ins>+ self.recipient_in_trash = False
</ins><span class="cx"> self.new_resource = True
</span><span class="cx"> else:
</span><span class="cx"> raise ImplicitProcessorException("5.3;Organizer change not allowed")
</span><span class="lines">@@ -457,13 +458,18 @@
</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 we have a recipient item in the trash, remove it right now so that we treat the iTIP message as a new
- # invite.
- if not self.new_resource and self.recipient_in_trash:
</del><ins>+ # Check if the incoming data has the recipient declined in all instances.
+ attendees = self.message.getAttendeeProperties((self.recipient.cuaddr,))
+ all_declined = all([attendee.parameterValue("PARTSTAT", "NEEDS-ACTION") == "DECLINED" for attendee in attendees])
+
+ # If we have a recipient item in the trash, and the incoming message has at least one undeclined partstat, then remove the trash
+ # item right now so that we treat the iTIP message as a new invite.
+ if not self.new_resource and self.recipient_in_trash and not all_declined:
</ins><span class="cx"> yield self.deleteCalendarResource(self.recipient_calendar_resource)
</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="cx"> self.recipient_calendar_resource = None
</span><ins>+ self.recipient_in_trash = False
</ins><span class="cx"> self.new_resource = True
</span><span class="cx">
</span><span class="cx"> # If there is no existing copy, then look for default calendar and copy it here
</span><span class="lines">@@ -471,8 +477,7 @@
</span><span class="cx">
</span><span class="cx"> # Check if the incoming data has the recipient declined in all instances. In that case we will not create
</span><span class="cx"> # a new resource as chances are the recipient previously deleted the resource and we want to keep it deleted.
</span><del>- attendees = self.message.getAttendeeProperties((self.recipient.cuaddr,))
- if all([attendee.parameterValue("PARTSTAT", "NEEDS-ACTION") == "DECLINED" for attendee in attendees]):
</del><ins>+ if all_declined:
</ins><span class="cx"> log.debug("ImplicitProcessing - originator '%s' to recipient '%s' processing METHOD:REQUEST, UID: '%s' - ignoring all declined" % (self.originator.cuaddr, self.recipient.cuaddr, self.uid))
</span><span class="cx"> returnValue((True, False, False, None,))
</span><span class="cx">
</span><span class="lines">@@ -544,8 +549,9 @@
</span><span class="cx"> # Only store inbox item when reply is not sent or always for users
</span><span class="cx"> store_inbox = store_inbox or self.recipient.record.getCUType() == "INDIVIDUAL"
</span><span class="cx"> else:
</span><ins>+ # Do not store inbox item if the resource is remaining in the trash
</ins><span class="cx"> send_reply = False
</span><del>- store_inbox = True
</del><ins>+ store_inbox = not self.recipient_in_trash
</ins><span class="cx">
</span><span class="cx"> # Let the store know that no time-range info has changed for a refresh (assuming that
</span><span class="cx"> # no auto-accept changes were made)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_trashpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_trash.py (14661 => 14662)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-04 18:06:01 UTC (rev 14661)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_trash.py 2015-04-06 16:44:14 UTC (rev 14662)
</span><span class="lines">@@ -568,8 +568,8 @@
</span><span class="cx"> data = yield self._getResourceData(txn, "user02", "calendar", "")
</span><span class="cx"> self.assertTrue("PARTSTAT=NEEDS-ACTION" in data)
</span><span class="cx">
</span><del>- resource = yield self._getResource(txn, "user01", "inbox", "")
- yield resource.remove()
</del><ins>+ resourceNames = yield self._getResourceNames(txn, "user01", "inbox")
+ self.assertEqual(len(resourceNames), 0)
</ins><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="lines">@@ -2019,7 +2019,7 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> home1 = yield txn.calendarHomeWithUID("user01", create=True)
</span><span class="cx"> collection = yield home1.childWithName("calendar")
</span><del>- resource = yield collection.createObjectResourceWithName(
</del><ins>+ yield collection.createObjectResourceWithName(
</ins><span class="cx"> "test.ics",
</span><span class="cx"> Component.allFromString(organizer1_data)
</span><span class="cx"> )
</span><span class="lines">@@ -2155,7 +2155,6 @@
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> home = yield self._homeForUser(txn, "user01")
</span><span class="cx"> yield home.getTrash(create=True) # force loading trash
</span><del>- calendar = yield self._collectionForUser(txn, "user01", "calendar")
</del><span class="cx"> calendars = yield home.calendars(onlyInTrash=False)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> set([c.name() for c in calendars]),
</span></span></pre>
</div>
</div>
</body>
</html>