diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-22 16:11:42 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-05-22 16:11:42 +0200 |
commit | 90d72e530d9f5c1089ff8d21d276b1542a9bcb1c (patch) | |
tree | ab8d701b5bfb17f0883f61060a66ef0f62a794e7 | |
parent | 2d28ee93a5fe0ea703490ccf10b93783f402647d (diff) | |
download | Ishtar-90d72e530d9f5c1089ff8d21d276b1542a9bcb1c.tar.bz2 Ishtar-90d72e530d9f5c1089ff8d21d276b1542a9bcb1c.zip |
Administrativ act: add signatory
-rw-r--r-- | archaeological_operations/forms.py | 14 | ||||
-rw-r--r-- | archaeological_operations/templates/ishtar/sheet_administrativeact.html | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 0b31cf8c3..f9bf8607c 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -1578,13 +1578,15 @@ class AdministrativeActOpeFormSelection(IshtarForm): class AdministrativeActForm(CustomForm, ManageOldType): form_label = _("General") - associated_models = {'act_type': models.ActType, } - # 'signatory':Person} + associated_models = {'act_type': models.ActType, + 'signatory': Person} act_type = forms.ChoiceField(label=_("Act type"), choices=[]) - # signatory = forms.IntegerField(label=_("Signatory"), - # widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person'), - # associated_model=Person, new=True), - # validators=[valid_id(Person)], required=False) + signatory = forms.IntegerField( + label=_("Signatory"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-person'), associated_model=Person, + new=True), + validators=[valid_id(Person)], required=False) act_object = forms.CharField(label=_(u"Object"), max_length=300, widget=forms.Textarea, required=False) signature_date = DateField( diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index 1ea2a789d..f0026807c 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -27,6 +27,7 @@ {% field_flex "Internal reference" item.ref_sra %} {% field_flex "Type" item.act_type %} {% field_flex "Object" item.act_object %} + {% field_flex_detail "Signatory" item.signatory %} {% field_flex "Signature date" item.signature_date %} {% field_flex "In charge" item.in_charge %} {% field_flex "Archaeological preventive operator" item.operator %} |