[CalendarServer-changes] [5544] CalendarServer/trunk/twistedcaldav/method/delete_common.py

[source_changes at macosforge.org]

Revision: 5544
          http://trac.macosforge.org/projects/calendarserver/changeset/5544
Author:   cdaboo at apple.com
Date:     2010-04-28 19:36:14 -0700 (Wed, 28 Apr 2010)
Log Message:
-----------
Sharee delete only removes the shared calendar.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/method/delete_common.py

Modified: CalendarServer/trunk/twistedcaldav/method/delete_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/delete_common.py	2010-04-29 02:34:44 UTC (rev 5543)
+++ CalendarServer/trunk/twistedcaldav/method/delete_common.py	2010-04-29 02:36:14 UTC (rev 5544)
@@ -199,6 +199,13 @@
             log.err(msg)
             raise HTTPError(StatusResponse(responsecode.BAD_REQUEST, msg))
 
+        # Check virtual share first
+        isVirtual = yield delresource.isVirtualShare(self.request)
+        if isVirtual:
+            log.debug("Removing shared calendar %s" % (delresource,))
+            yield delresource.removeVirtualShare(self.request)
+            returnValue(responsecode.NO_CONTENT)
+
         log.debug("Deleting calendar %s" % (delresource.fp.path,))
 
         errors = ResponseQueue(deluri, "DELETE", responsecode.NO_CONTENT)
@@ -215,12 +222,6 @@
 
         # Now do normal delete
 
-        # Check virtual share first
-        isVirtual = yield delresource.isVirtualShare(self.request)
-        if isVirtual:
-            yield delresource.removeVirtualShare(self.request)
-            returnValue(responsecode.NO_CONTENT)
-
         # Handle sharing
         wasShared = (yield delresource.isShared(self.request))
         if wasShared:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100428/945356ea/attachment.html>