[CalendarServer-changes] [14657] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 14657
          http://trac.calendarserver.org//changeset/14657
Author:   cdaboo at apple.com
Date:     2015-04-03 11:57:04 -0700 (Fri, 03 Apr 2015)
Log Message:
-----------
Fix for CDT+trash. Checking sharing state before moving to trash as we need to know whether the original calendar is shared.

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

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-04-03 18:55:22 UTC (rev 14656)
+++ CalendarServer/trunk/requirements-dev.txt	2015-04-03 18:57:04 UTC (rev 14657)
@@ -8,4 +8,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14654#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14656#egg=CalDAVTester

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-03 18:55:22 UTC (rev 14656)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-04-03 18:57:04 UTC (rev 14657)
@@ -4173,17 +4173,19 @@
             # 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)
 
+            # Do scheduling check before the move to trash
+            if scheduler is not None:
+                # Cannot do implicit in sharee's shared calendar
+                if not self.calendar().owned():
+                    scheduler.setSchedulingNotAllowed(
+                        ShareeAllowedError,
+                        "Sharee's cannot schedule",
+                    )
+
             yield super(CalendarObject, self).remove()
 
         # Do scheduling
         if scheduler is not None:
-            # Cannot do implicit in sharee's shared calendar
-            if not self.calendar().owned():
-                scheduler.setSchedulingNotAllowed(
-                    ShareeAllowedError,
-                    "Sharee's cannot schedule",
-                )
-
             yield scheduler.doImplicitScheduling()
 
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150403/fbcf6e2c/attachment.html>