diff -r 495862266785 -r 6b46d73823f5 web/httpcache.py --- a/web/httpcache.py Wed Sep 23 19:26:38 2009 +0200 +++ b/web/httpcache.py Wed Sep 23 19:40:19 2009 +0200 @@ -18,7 +18,7 @@ def __init__(self, view): self.view = view self.req = view.req - self.rset = view.rset + self.cw_rset = view.rset def set_headers(self): self.req.set_header('Cache-control', 'no-cache') @@ -72,12 +72,12 @@ with a modification time to consider) using the `last_modified` method """ def etag(self): - if self.rset is None or len(self.rset) == 0: # entity startup view for instance + if self.cw_rset is None or len(self.cw_rset) == 0: # entity startup view for instance return super(EntityHTTPCacheManager, self).etag() - if len(self.rset) > 1: + if len(self.cw_rset) > 1: raise NoEtag() etag = super(EntityHTTPCacheManager, self).etag() - eid = self.rset[0][0] + eid = self.cw_rset[0][0] if self.req.user.owns(eid): etag += ',owners' return str(eid) + '/' + etag