equal
deleted
inserted
replaced
92 # ordering number for this field instance |
92 # ordering number for this field instance |
93 self.creation_rank = Field.__creation_rank |
93 self.creation_rank = Field.__creation_rank |
94 Field.__creation_rank += 1 |
94 Field.__creation_rank += 1 |
95 |
95 |
96 def __unicode__(self): |
96 def __unicode__(self): |
97 return u'<%s name=%r label=%r id=%r initial=%r @%x>' % ( |
97 return u'<%s name=%r label=%r id=%r initial=%r visible=%r @%x>' % ( |
98 self.__class__.__name__, self.name, self.label, |
98 self.__class__.__name__, self.name, self.label, |
99 self.id, self.initial, id(self)) |
99 self.id, self.initial, self.is_visible(), id(self)) |
100 |
100 |
101 def __repr__(self): |
101 def __repr__(self): |
102 return self.__unicode__().encode('utf-8') |
102 return self.__unicode__().encode('utf-8') |
103 |
103 |
104 def set_name(self, name): |
104 def set_name(self, name): |
405 if entity.has_eid(): |
405 if entity.has_eid(): |
406 rset = entity.related(self.name, self.role) |
406 rset = entity.related(self.name, self.role) |
407 relatedvocab = [(e.view('combobox'), e.eid) for e in rset.entities()] |
407 relatedvocab = [(e.view('combobox'), e.eid) for e in rset.entities()] |
408 else: |
408 else: |
409 relatedvocab = [] |
409 relatedvocab = [] |
410 return res + form.form_field_vocabulary(self) + relatedvocab |
410 vocab = res + form.form_field_vocabulary(self) + relatedvocab |
|
411 if self.sort: |
|
412 vocab = sorted(vocab) |
|
413 return vocab |
411 |
414 |
412 def format_single_value(self, req, value): |
415 def format_single_value(self, req, value): |
413 return value |
416 return value |
414 |
417 |
415 |
418 |