From 3a62c5b92b06d11331cb8aa9add47d22c32cae31 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 26 Aug 2013 23:55:44 +0200 Subject: Change Person selection form - add a Person sheet (refs #425) * change sheet creation to allow non historized object * add related names corresponding to person for operation, files and sources (through Author) * use a jqGrid associated to a form to select persons * create sheet templates for persons * add appropriate urls --- ishtar_common/forms_common.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'ishtar_common/forms_common.py') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index db406aaa9..0a001883c 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -100,13 +100,28 @@ class OrganizationForm(forms.Form): new_item.save() return new_item +class PersonSelect(TableSelect): + name = forms.CharField(label=_(u"Name"), max_length=30) + surname = forms.CharField(label=_(u"Surname"), max_length=20) + email = forms.CharField(label=_(u"Email"), max_length=40) + person_types = forms.ChoiceField(label=_(u"Type"), choices=[]) + attached_to = forms.IntegerField(label=_("Organization"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-organization'), + associated_model=models.Organization), + validators=[models.valid_id(models.Organization)]) + + def __init__(self, *args, **kwargs): + super(PersonSelect, self).__init__(*args, **kwargs) + self.fields['person_types'].choices = models.PersonType.get_types() + class PersonFormSelection(forms.Form): form_label = _(u"Person search") associated_models = {'pk':models.Person} currents = {'pk':models.Person} - pk = forms.IntegerField(label=_("Person"), - widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person'), - associated_model=models.Person), + pk = forms.IntegerField(label="", + widget=widgets.JQueryJqGrid(reverse_lazy('get-person'), + PersonSelect, models.Person), validators=[models.valid_id(models.Person)]) class PersonForm(forms.Form): -- cgit v1.2.3