[CalendarServer-changes] [14661] CalendarServer/trunk/txdav/caldav/datastore/sql.py

source_changes at macosforge.org source_changes at macosforge.org
Sat Apr 4 11:06:01 PDT 2015


Revision: 14661
          http://trac.calendarserver.org//changeset/14661
Author:   cdaboo at apple.com
Date:     2015-04-04 11:06:01 -0700 (Sat, 04 Apr 2015)
Log Message:
-----------
No dropbox when resource is in trash.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-04 15:04:55 UTC (rev 14660)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-04 18:06:01 UTC (rev 14661)
@@ -686,6 +686,7 @@
             [co.DROPBOX_ID],
             From=co.join(cb, co.PARENT_RESOURCE_ID == cb.RESOURCE_ID),
             Where=(co.DROPBOX_ID != None).And(
+                co.TRASHED == None).And(
                 cb.HOME_RESOURCE_ID == self._resourceID),
             OrderBy=co.DROPBOX_ID
         ).on(self._txn))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150404/c1578a10/attachment.html>


More information about the calendarserver-changes mailing list