# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1242215871 -7200
# Node ID aa7136519c195b2a81dc0041d989d4410609b7a7
# Parent  7a934055dd45d1c7d816d0d85d4424b88a3e94e8
consider fields_kwargs even when field specified

diff -r 7a934055dd45 -r aa7136519c19 web/views/autoform.py
--- a/web/views/autoform.py	Wed May 13 12:15:03 2009 +0200
+++ b/web/views/autoform.py	Wed May 13 13:57:51 2009 +0200
@@ -137,14 +137,12 @@
             # XXX use a sample target type. Document this.
             tschemas = rschema.targets(eschema, role)
             fieldcls = cls_or_self.rfields.etype_get(eschema, rschema, role, tschemas[0])
+            kwargs = cls_or_self.rfields_kwargs.etype_get(eschema, rschema, role, tschemas[0])
+            if kwargs is None:
+                kwargs = {}
             if fieldcls:
-                return fieldcls(name=name, role=role, eidparam=True)
-            kwargs = cls_or_self.rfields_kwargs.etype_get(eschema, rschema, role, tschemas[0])
-            if kwargs:
-                field = guess_field(eschema, rschema, role,
-                                    eidparam=True, **kwargs)
-            else:
-                field = guess_field(eschema, rschema, role, eidparam=True)
+                return fieldcls(name=name, role=role, eidparam=True, **kwargs)
+            field = guess_field(eschema, rschema, role, eidparam=True, **kwargs)
             if field is None:
                 raise
             return field