[CalendarServer-changes] [14384] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Feb 6 14:32:49 PST 2015
Revision: 14384
http://trac.calendarserver.org//changeset/14384
Author: cdaboo at apple.com
Date: 2015-02-06 14:32:49 -0800 (Fri, 06 Feb 2015)
Log Message:
-----------
Fix per-user data during splitting.
Modified Paths:
--------------
CalendarServer/trunk/requirements-dev.txt
CalendarServer/trunk/twistedcaldav/icaldav.py
CalendarServer/trunk/twistedcaldav/method/get.py
CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
CalendarServer/trunk/twistedcaldav/method/report_common.py
CalendarServer/trunk/twistedcaldav/resource.py
CalendarServer/trunk/twistedcaldav/storebridge.py
CalendarServer/trunk/twistedcaldav/upgrade.py
Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/requirements-dev.txt 2015-02-06 22:32:49 UTC (rev 14384)
@@ -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@14377#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14383#egg=CalDAVTester
Modified: CalendarServer/trunk/twistedcaldav/icaldav.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/icaldav.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/icaldav.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -67,7 +67,7 @@
Create a calendar collection for this resource.
"""
- def iCalendar(): #@NoSelf
+ def component(): #@NoSelf
"""
Instantiate an iCalendar component object representing this resource or
its child with the given name.
Modified: CalendarServer/trunk/twistedcaldav/method/get.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/get.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/get.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -87,7 +87,7 @@
if accepted_type is None:
raise HTTPError(StatusResponse(responsecode.NOT_ACCEPTABLE, "Cannot generate requested data type"))
- caldata = (yield self.iCalendarForUser())
+ caldata = (yield self.componentForUser())
# Filter any attendee hidden instances
caldata = HiddenInstanceFilter().filter(caldata)
Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -216,7 +216,7 @@
child_uri_name = child_uri[child_uri.rfind("/") + 1:]
if generate_calendar_data or not index_query_ok:
- calendar = (yield child.iCalendarForUser())
+ calendar = (yield child.componentForUser())
assert calendar is not None, "Calendar %s is missing from calendar collection %r" % (child_uri_name, self)
else:
calendar = None
@@ -240,7 +240,7 @@
# Check private events access status
isowner = (yield calresource.isOwner(request))
- calendar = (yield calresource.iCalendarForUser())
+ calendar = (yield calresource.componentForUser())
yield queryCalendarObjectResource(calresource, uri, None, calendar, timezone)
returnValue(True)
Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -381,7 +381,7 @@
if dataAllowed:
# Handle private events access restrictions
if calendar is None:
- calendar = (yield resource.iCalendarForUser())
+ calendar = (yield resource.componentForUser())
filtered = HiddenInstanceFilter().filter(calendar)
filtered = PrivateEventFilter(resource.accessMode, isowner).filter(filtered)
filtered = CalendarDataFilter(property, timezone).filter(filtered)
@@ -684,12 +684,12 @@
# Add extended details
if do_event_details:
child = (yield request.locateChildResource(calresource, name))
- calendar = (yield child.iCalendarForUser())
+ calendar = (yield child.componentForUser())
_addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
else:
child = (yield request.locateChildResource(calresource, name))
- calendar = (yield child.iCalendarForUser())
+ calendar = (yield child.componentForUser())
# The calendar may come back as None if the resource is being changed, or was deleted
# between our initial index query and getting here. For now we will ignore this error, but in
@@ -731,7 +731,7 @@
# Add extended details
if calendar.mainType() == "VEVENT" and do_event_details:
child = (yield request.locateChildResource(calresource, name))
- calendar = (yield child.iCalendarForUser())
+ calendar = (yield child.componentForUser())
_addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
returnValue(matchtotal)
Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -1369,13 +1369,13 @@
def iCalendarFiltered(self, isowner):
# Now "filter" the resource calendar data
- caldata = (yield self.iCalendarForUser())
+ caldata = (yield self.componentForUser())
caldata = HiddenInstanceFilter().filter(caldata)
caldata = PrivateEventFilter(self.accessMode, isowner).filter(caldata)
returnValue(caldata)
- def iCalendar(self):
+ def component(self):
# storebridge handles this method
raise NotImplementedError()
Modified: CalendarServer/trunk/twistedcaldav/storebridge.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -2232,6 +2232,10 @@
return self._newStoreObject.component()
+ def componentForUser(self):
+ return self._newStoreObject.component()
+
+
def allowedTypes(self):
"""
Return a dict of allowed MIME types for storing, mapped to equivalent PyCalendar types.
@@ -2260,7 +2264,7 @@
if accepted_type is None:
raise HTTPError(StatusResponse(responsecode.NOT_ACCEPTABLE, "Cannot generate requested data type"))
- output = yield self.component()
+ output = yield self.componentForUser()
response = Response(OK, {}, output.getText(accepted_type))
response.headers.setHeader("content-type", MimeType.fromString("%s; charset=utf-8" % (accepted_type,)))
@@ -2633,13 +2637,10 @@
self._initializeWithObject(newObject, newParent)
returnValue(txn)
- iCalendar = _CommonObjectResource.component
-
def componentForUser(self):
return self._newStoreObject.componentForUser()
- iCalendarForUser = componentForUser
def validIfScheduleMatch(self, request):
"""
@@ -3041,8 +3042,8 @@
etag2 = yield other.etag()
scheduletag1 = self.scheduleTag
scheduletag2 = otherStoreObject.scheduleTag
- cal1 = yield self.component()
- cal2 = yield other.component()
+ cal1 = yield self.componentForUser()
+ cal2 = yield other.componentForUser()
xml_responses = [
davxml.PropertyStatusResponse(
@@ -3293,7 +3294,7 @@
yield newchild.storeComponent(component)
if returnChangedData and newchild._newStoreObject._componentChanged:
- result = (yield newchild.component())
+ result = (yield newchild.componentForUser())
returnValue(result)
else:
returnValue(None)
Modified: CalendarServer/trunk/twistedcaldav/upgrade.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/upgrade.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2015-02-06 22:32:49 UTC (rev 14384)
@@ -1336,7 +1336,7 @@
inbox, ownerPrincipal.scheduleInboxURL()
)
- calendar = yield inboxItem.iCalendar()
+ calendar = yield inboxItem.componentForUser()
if calendar.mainType() is not None:
try:
method = calendar.propertyValue("METHOD")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150206/6883f167/attachment-0001.html>
More information about the calendarserver-changes
mailing list