--- a/web/views/basecomponents.py	Tue Dec 08 16:56:56 2009 +0100
+++ b/web/views/basecomponents.py	Tue Dec 08 17:11:47 2009 +0100
@@ -236,7 +236,7 @@
     order = 1
 
     def cell_call(self, row, col, view=None):
-        self.wview('metadata', self.rset, row=row, col=col)
+        self.wview('metadata', self.cw_rset, row=row, col=col)
 
 
 def registration_callback(vreg):

--- a/web/views/forms.py	Tue Dec 08 16:56:56 2009 +0100
+++ b/web/views/forms.py	Tue Dec 08 17:11:47 2009 +0100
@@ -184,7 +184,7 @@
         if value is None:
             if field.name in rendervalues:
                 value = rendervalues[field.name]
-            elif field.name in self.extra_kwargs:
+            elif field.name in self.cw_extra_kwargs:
                 value = self.extra_kwargs[field.name]
             else:
                 value = self.form_field_value(field, load_bytes)
@@ -376,7 +376,7 @@
             return super(EntityFieldsForm, self).form_field_value(field, load_bytes)
         if attr == '__type':
             return entity.__regid__
-        if self.schema.rschema(attr).final:
+        if self._cw.vreg.schema.rschema(attr).final:
             attrtype = entity.e_schema.destination(attr)
             if attrtype == 'Password':
                 return entity.has_eid() and INTERNAL_FIELD_VALUE or ''