diff options
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 48 |
1 files changed, 8 insertions, 40 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 63436bf57..cff44dda6 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -509,26 +509,16 @@ class OperationSelect(GeoItemSelect): end_date = forms.NullBooleanField(label=_("Is open?")) in_charge = forms.IntegerField( widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-person-permissive', - args=[person_type_pks_lazy(['sra_agent'])] - ), - associated_model=Person), + reverse_lazy('autocomplete-person-permissive'), associated_model=Person), label=_("Scientific monitor")) scientist = forms.IntegerField( widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-person-permissive', - args=[person_type_pks_lazy(['sra_agent', 'head_scientist'])]), - associated_model=Person), + reverse_lazy('autocomplete-person-permissive'), associated_model=Person), label=_("Scientist in charge")) operator = forms.IntegerField( label=_("Operator"), widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-organization', - args=[organization_type_pks_lazy(['operator'])]), - associated_model=Organization), + reverse_lazy('autocomplete-organization'), associated_model=Organization), validators=[valid_id(Organization)]) operator_reference = forms.CharField(label=_("Operator reference"), max_length=200) @@ -738,23 +728,14 @@ class OperationFormGeneral(CustomForm, ManageOldType): scientist = forms.IntegerField( label=_("Head scientist"), widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-person', - args=[person_type_pks_lazy(['head_scientist', 'sra_agent'])]), + reverse_lazy('autocomplete-person'), associated_model=Person, - tips=lazy(get_sra_agent_head_scientist_label), - limit={ - 'person_types': (person_type_pk_lazy('head_scientist'), - person_type_pk_lazy('sra_agent'))}, new=True), validators=[valid_id(Person)], required=False) operator = forms.IntegerField( label=_("Operator"), widget=widgets.JQueryAutoComplete( - reverse_lazy('autocomplete-organization', - args=[organization_type_pk_lazy('operator')]), - limit={'organization_type': organization_type_pk_lazy('operator')}, - tips=lazy(get_operator_label), + reverse_lazy('autocomplete-organization'), associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) operator_reference = forms.CharField(label=_("Operator reference"), @@ -762,12 +743,8 @@ class OperationFormGeneral(CustomForm, ManageOldType): in_charge = forms.IntegerField( label=_("Scientific monitor"), widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-person', - args=[person_type_pks_lazy(['sra_agent'])]), + reverse_lazy('autocomplete-person'), associated_model=Person, - tips=lazy(get_sra_agent_label), - limit={'person_types': [person_type_pk_lazy('sra_agent')]}, new=True), validators=[valid_id(Person)], required=False) collaborator = widgets.Select2MultipleField( @@ -785,14 +762,7 @@ class OperationFormGeneral(CustomForm, ManageOldType): cira_rapporteur = forms.IntegerField( label="Rapporteur CTRA/CIRA", widget=widgets.JQueryAutoComplete( - reverse_lazy( - 'autocomplete-person', - args=[person_type_pks_lazy(['head_scientist', - 'sra_agent'])]), - limit={'person_types': [ - person_type_pk_lazy('sra_agent'), - person_type_pk_lazy('head_scientist')]}, - tips=lazy(get_sra_agent_head_scientist_label), + reverse_lazy('autocomplete-person'), associated_model=Person, new=True), validators=[valid_id(Person)], required=False) negative_result = forms.NullBooleanField( @@ -1730,9 +1700,7 @@ class QAOperationFormMulti(QAForm): qa_operator = forms.IntegerField( label=_("Operator"), widget=widgets.JQueryAutoComplete( - reverse_lazy('autocomplete-organization', - args=[organization_type_pk_lazy('operator')]), - limit={'organization_type': organization_type_pk_lazy('operator')}, + reverse_lazy('autocomplete-organization'), associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) qa_documentation_received = forms.ChoiceField( |