equal
deleted
inserted
replaced
615 def vocabulary(self, entity, limit=None): |
615 def vocabulary(self, entity, limit=None): |
616 req = entity.req |
616 req = entity.req |
617 # first see if its specified by __linkto form parameters |
617 # first see if its specified by __linkto form parameters |
618 linkedto = entity.linked_to(self.name, self.role) |
618 linkedto = entity.linked_to(self.name, self.role) |
619 if linkedto: |
619 if linkedto: |
620 entities = (req.eid_rset(eid).get_entity(0, 0) for eid in linkedto) |
620 entities = (req.entity_from_eid(eid) for eid in linkedto) |
621 return [(entity.view('combobox'), entity.eid) for entity in entities] |
621 return [(entity.view('combobox'), entity.eid) for entity in entities] |
622 # it isn't, check if the entity provides a method to get correct values |
622 # it isn't, check if the entity provides a method to get correct values |
623 if not self.required(entity): |
623 if not self.required(entity): |
624 res = [('', INTERNAL_FIELD_VALUE)] |
624 res = [('', INTERNAL_FIELD_VALUE)] |
625 else: |
625 else: |