diff -r f63d090eb34a -r de0548cb0ab8 web/formfields.py --- a/web/formfields.py Thu Apr 30 01:21:48 2009 +0200 +++ b/web/formfields.py Thu Apr 30 08:51:54 2009 +0200 @@ -94,9 +94,9 @@ Field.__creation_rank += 1 def __unicode__(self): - return u'<%s name=%r label=%r id=%r initial=%r @%x>' % ( + return u'<%s name=%r label=%r id=%r initial=%r visible=%r @%x>' % ( self.__class__.__name__, self.name, self.label, - self.id, self.initial, id(self)) + self.id, self.initial, self.is_visible(), id(self)) def __repr__(self): return self.__unicode__().encode('utf-8') @@ -406,7 +406,10 @@ relatedvocab = [(e.view('combobox'), e.eid) for e in rset.entities()] else: relatedvocab = [] - return res + form.form_field_vocabulary(self) + relatedvocab + vocab = res + form.form_field_vocabulary(self) + relatedvocab + if self.sort: + vocab = sorted(vocab) + return vocab def format_single_value(self, req, value): return value