# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1267164491 -3600
# Node ID d8206e0d18387243ade6fa93f51f4df7517fe985
# Parent  6035e96b64ddd110ed7dc9b8a0249d4c38a5738b# Parent  8757fca2c30823f4cd73b3a7fc7278c8ec272ad6
merge

diff -r 6035e96b64dd -r d8206e0d1838 server/hook.py
--- a/server/hook.py	Fri Feb 26 07:07:28 2010 +0100
+++ b/server/hook.py	Fri Feb 26 07:08:11 2010 +0100
@@ -44,7 +44,7 @@
 from logilab.common.logging_ext import set_log_methods
 
 from cubicweb.cwvreg import CWRegistry, VRegistry
-from cubicweb.selectors import (objectify_selector, lltrace, match_search_state,
+from cubicweb.selectors import (objectify_selector, lltrace, ExpectedValueSelector,
                                 implements)
 from cubicweb.appobject import AppObject
 
@@ -134,7 +134,7 @@
         return iter(chain(*self.iterators))
 
 
-class match_rtype(match_search_state):
+class match_rtype(ExpectedValueSelector):
     """accept if parameters specified as initializer arguments are specified
     in named arguments given to the selector
 
@@ -159,7 +159,7 @@
         return 1
 
 
-class match_rtype_sets(match_search_state):
+class match_rtype_sets(ExpectedValueSelector):
     """accept if parameters specified as initializer arguments are specified
     in named arguments given to the selector
     """
diff -r 6035e96b64dd -r d8206e0d1838 web/uicfg.py
--- a/web/uicfg.py	Fri Feb 26 07:07:28 2010 +0100
+++ b/web/uicfg.py	Fri Feb 26 07:08:11 2010 +0100
@@ -251,7 +251,7 @@
     _allowed_form_types = ('main', 'inlined', 'muledit')
     _allowed_values = {'main': ('attributes', 'inlined', 'relations',
                                 'metadata', 'hidden'),
-                       'inlined': ('attributes', 'hidden'),
+                       'inlined': ('attributes', 'inlined', 'hidden'),
                        'muledit': ('attributes', 'hidden'),
                        }
 
diff -r 6035e96b64dd -r d8206e0d1838 web/views/forms.py
--- a/web/views/forms.py	Fri Feb 26 07:07:28 2010 +0100
+++ b/web/views/forms.py	Fri Feb 26 07:08:11 2010 +0100
@@ -112,7 +112,7 @@
     def default_renderer(self):
         return self._cw.vreg['formrenderers'].select(
             self.form_renderer_id, self._cw,
-            rset=self.cw_rset, row=self.cw_row, col=self.cw_col)
+            rset=self.cw_rset, row=self.cw_row, col=self.cw_col or 0)
 
     formvalues = None
     def build_context(self, formvalues=None):