Revision: 6469 http://trac.macosforge.org/projects/calendarserver/changeset/6469 Author: cdaboo@apple.com Date: 2010-10-26 11:23:52 -0700 (Tue, 26 Oct 2010) Log Message: ----------- Temporary patch for partitioned freebusy permissions problem. Modified Paths: -------------- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/method/report_common.py Modified: CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/method/report_common.py =================================================================== --- CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/method/report_common.py 2010-10-26 18:06:42 UTC (rev 6468) +++ CalendarServer/branches/users/wsanchez/deployment/twistedcaldav/method/report_common.py 2010-10-26 18:23:52 UTC (rev 6469) @@ -305,13 +305,13 @@ """ # First check the privilege on this collection - try: - d = waitForDeferred(calresource.checkPrivileges(request, (caldavxml.ReadFreeBusy(),), principal=organizerPrincipal)) - yield d - d.getResult() - except AccessDeniedError: - yield matchtotal - return +# try: +# d = waitForDeferred(calresource.checkPrivileges(request, (caldavxml.ReadFreeBusy(),), principal=organizerPrincipal)) +# yield d +# d.getResult() +# except AccessDeniedError: +# yield matchtotal +# return # May need organizer principal organizer_principal = calresource.principalForCalendarUserAddress(organizer) if organizer else None @@ -369,12 +369,12 @@ yield child child = child.getResult() - try: - d = waitForDeferred(child.checkPrivileges(request, (caldavxml.ReadFreeBusy(),), inherited_aces=filteredaces, principal=organizerPrincipal)) - yield d - d.getResult() - except AccessDeniedError: - continue +# try: +# d = waitForDeferred(child.checkPrivileges(request, (caldavxml.ReadFreeBusy(),), inherited_aces=filteredaces, principal=organizerPrincipal)) +# yield d +# d.getResult() +# except AccessDeniedError: +# continue # Short-cut - if an fbtype exists we can use that if type == "VEVENT" and aggregated_resources[key][0][3] != '?':