[CalendarServer-changes] [3765] CalendarServer/trunk/calendarserver/webcal/resource.py

[source_changes at macosforge.org]

Revision: 3765
          http://trac.macosforge.org/projects/calendarserver/changeset/3765
Author:   wsanchez at apple.com
Date:     2009-02-27 16:42:41 -0800 (Fri, 27 Feb 2009)
Log Message:
-----------
Fix permissions, remove debug junk

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webcal/resource.py

Modified: CalendarServer/trunk/calendarserver/webcal/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webcal/resource.py	2009-02-28 00:35:27 UTC (rev 3764)
+++ CalendarServer/trunk/calendarserver/webcal/resource.py	2009-02-28 00:42:41 UTC (rev 3765)
@@ -33,6 +33,7 @@
 from twisted.web2.http_headers import MimeType
 from twisted.web2.stream import MemoryStream
 from twisted.web2.dav import davxml
+from twisted.web2.dav.resource import TwistedACLInheritable
 
 from twistedcaldav.config import config
 from twistedcaldav.extensions import DAVFile, ReadOnlyResourceMixIn
@@ -46,6 +47,7 @@
                     davxml.Privilege(davxml.Read()),
                 ),
                 davxml.Protected(),
+                TwistedACLInheritable(),
             ),
         )
 
@@ -73,7 +75,7 @@
         return None
 
     def createSimilarFile(self, path):
-        return DAVFile(path)
+        return DAVFile(path, principalCollections=self.principalCollections())
 
     _htmlContent_lastCheck      = 0
     _htmlContent_statInfo       = 0
@@ -87,7 +89,7 @@
         else:
             cacheAttr = "_htmlContent"
             templateFileName = "template.html"
-        templateFileName = os.path.join(config.WebCalendarRoot, "calendar", templateFileName)+"1"
+        templateFileName = os.path.join(config.WebCalendarRoot, "calendar", templateFileName)
 
         #
         # See if the file changed, and dump the cached template if so.
@@ -100,12 +102,6 @@
                 statInfo = os.stat(templateFileName)
                 statInfo = (statInfo.st_mtime, statInfo.st_size)
                 if statInfo != getattr(self, cacheAttr + "_statInfo"):
-                    print "*"*40
-                    print currentTime
-                    print getattr(self, cacheAttr + "_lastCheck")
-                    print statInfo
-                    print getattr(self, cacheAttr + "_statInfo")
-                    print "*"*40
                     delattr(self, cacheAttr)
                     setattr(self, cacheAttr + "_statInfo", statInfo)
                 setattr(self, cacheAttr + "_lastCheck", currentTime)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090227/ae8f145b/attachment.html>