<!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>[14805] 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/14805">14805</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 16:53:53 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow recovery of all trashed events or collections</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (14804 => 14805)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2015-05-19 21:16:06 UTC (rev 14804)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-05-19 23:53:53 UTC (rev 14805)
</span><span class="lines">@@ -2758,7 +2758,21 @@
</span><span class="cx">
</span><span class="cx"> elif action == "recovertrash":
</span><span class="cx"> mode = request.args.get("mode", ("event",))[0]
</span><del>- recoveryID = int(request.args.get("id", ("0",))[0])
</del><ins>+ recoveryID = request.args.get("id", (None,))[0]
+ if recoveryID is None:
+ returnValue(
+ self._ok("error", "Invalid id")
+ )
+ if recoveryID == "all":
+ recoveryID = None
+ else:
+ try:
+ recoveryID = int(recoveryID)
+ except ValueError:
+ returnValue(
+ self._ok("error", "Invalid id")
+ )
+
</ins><span class="cx"> yield self._newStoreHome.recoverTrash(mode, recoveryID)
</span><span class="cx"> returnValue(
</span><span class="cx"> self._ok("ok", "Recover Trash")
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14804 => 14805)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-05-19 21:16:06 UTC (rev 14804)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-05-19 23:53:53 UTC (rev 14805)
</span><span class="lines">@@ -3127,16 +3127,31 @@
</span><span class="cx"> if trash is not None:
</span><span class="cx">
</span><span class="cx"> if mode == "event":
</span><del>- child = yield trash.objectResourceWithID(recoveryID)
- if child is not None:
- yield child.fromTrash()
-
</del><ins>+ if recoveryID:
+ child = yield trash.objectResourceWithID(recoveryID)
+ if child is not None:
+ yield child.fromTrash()
+ else:
+ # Recover all trashed events
+ untrashedCollections = yield self.children(onlyInTrash=False)
+ for collection in untrashedCollections:
+ children = yield trash.trashForCollection(
+ collection._resourceID
+ )
+ for child in children:
+ yield child.fromTrash()
</ins><span class="cx"> else:
</span><del>- collection = yield self.childWithID(recoveryID, onlyInTrash=True)
- if collection is not None:
- yield collection.fromTrash(
- restoreChildren=True, delta=datetime.timedelta(minutes=5)
- )
</del><ins>+ if recoveryID:
+ collection = yield self.childWithID(recoveryID, onlyInTrash=True)
+ if collection is not None:
+ yield collection.fromTrash(
+ restoreChildren=True, delta=datetime.timedelta(minutes=5)
+ )
+ else:
+ # Recover all trashed collections (and their events)
+ trashedCollections = yield self.children(onlyInTrash=True)
+ for collection in trashedCollections:
+ yield collection.fromTrash(restoreChildren=True)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class CommonHomeChild(FancyEqMixin, Memoizable, _SharedSyncLogic, HomeChildBase, SharingMixIn):
</span></span></pre>
</div>
</div>
</body>
</html>