diff -r 546b9884d92c -r a9841184be7c web/formfields.py --- a/web/formfields.py Thu Apr 23 17:21:39 2009 +0200 +++ b/web/formfields.py Thu Apr 23 17:22:02 2009 +0200 @@ -436,12 +436,11 @@ kwargs.setdefault('cols', cols) -def guess_field(eclass, rschema, role='subject', skip_meta_attr=True, **kwargs): +def guess_field(eschema, rschema, role='subject', skip_meta_attr=True, **kwargs): """return the most adapated widget to edit the relation 'subjschema rschema objschema' according to information found in the schema """ fieldclass = None - eschema = eclass.e_schema if role == 'subject': targetschema = rschema.objects(eschema)[0] card = rschema.rproperty(eschema, targetschema, 'cardinality')[0] @@ -484,7 +483,7 @@ for metadata in ('format', 'encoding'): metaschema = eschema.has_metadata(rschema, metadata) if metaschema is not None: - kwargs['%s_field' % metadata] = guess_field(eclass, metaschema, + kwargs['%s_field' % metadata] = guess_field(eschema, metaschema, skip_meta_attr=False) return fieldclass(**kwargs) kwargs['role'] = role