--- a/web/views/cwproperties.py	Tue Jan 19 12:34:52 2010 +0100
+++ b/web/views/cwproperties.py	Tue Jan 19 14:41:19 2010 +0100
@@ -188,8 +188,8 @@
         return entity
 
     def form(self, formid, keys, splitlabel=False):
-        form = self.vreg['forms'].select(
-            'composite', self.req, domid=formid, action=self.build_url(),
+        form = self._cw.vreg['forms'].select(
+            'composite', self._cw, domid=formid, action=self._cw.build_url(),
             form_buttons=self.form_buttons,
             onsubmit="return validatePrefsForm('%s')" % formid,
             submitmsg=self._cw._('changes applied'))

--- a/web/views/navigation.py	Tue Jan 19 12:34:52 2010 +0100
+++ b/web/views/navigation.py	Tue Jan 19 14:41:19 2010 +0100
@@ -197,9 +197,9 @@
     """write pages index in w stream (default to view.w) and then limit the result
     set (default to view.rset) to the currently displayed page
     """
-    req = view.req
+    req = view._cw
     if rset is None:
-        rset = view.rset
+        rset = view.cw_rset
     nav = req.vreg['components'].select_or_none(
         'navigation', req, rset=rset, page_size=page_size)
     if nav: