diff options
Diffstat (limited to 'archaeological_warehouse/forms.py')
| -rw-r--r-- | archaeological_warehouse/forms.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index c5720390a..3b10fb608 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -265,7 +265,7 @@ class ContainerForm(CustomForm, ManageOldType, forms.Form): extra_form_modals = ["warehouse", "organization", "person", "container"] associated_models = {'container_type': models.ContainerType, 'location': models.Warehouse, - 'collection': models.Warehouse, + 'responsibility': models.Warehouse, 'parent': models.Container} reference = forms.CharField(label=_("Ref."), max_length=200) old_reference = forms.CharField(label=_("Old reference"), required=False, @@ -286,8 +286,8 @@ class ContainerForm(CustomForm, ManageOldType, forms.Form): validators=[valid_id(models.Container)], required=False ) - collection = forms.IntegerField( - label=_("Collection"), + responsibility = forms.IntegerField( + label=_("Responsibility"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-warehouse'), associated_model=models.Warehouse, new=True), @@ -415,6 +415,8 @@ class ContainerSelect(DocumentItemSelect): 'archaeological-warehouse', 'container' )) location_name = get_warehouse_field(label=_("Warehouse")) + responsibility_name = get_warehouse_field( + label=_("Warehouse (responsibility)")) container_type = forms.ChoiceField(label=_("Container type"), choices=[]) reference = forms.CharField(label=_("Ref.")) old_reference = forms.CharField(label=_("Old reference")) @@ -597,7 +599,8 @@ class QAContainerFormMulti(QAForm): REPLACE_FIELDS = [ "qaparent", "qacontainer_type", - "qalocation" + "qalocation", + "qaresponsibility" ] HEADERS = { @@ -613,6 +616,12 @@ class QAContainerFormMulti(QAForm): reverse_lazy('autocomplete-warehouse'), associated_model=models.Warehouse), validators=[valid_id(models.Warehouse)], required=False) + qaresponsibility = forms.IntegerField( + label=_("Responsibility"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-warehouse'), + associated_model=models.Warehouse), + validators=[valid_id(models.Warehouse)], required=False) qaparent = forms.IntegerField( label=_("Parent"), widget=widgets.JQueryAutoComplete( @@ -638,6 +647,12 @@ class QAContainerFormMulti(QAForm): except models.Warehouse.DoesNotExist: return "" + def _get_qaresponsibility(self, value): + try: + return models.Warehouse.objects.get(pk=value).name + except models.Warehouse.DoesNotExist: + return "" + def _get_qaparent(self, value): try: return models.Container.objects.get(pk=value).cached_label |