From 9d5f0791187ff6b18d3ffa4db4d593fe96834e8d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 7 Oct 2020 19:09:30 +0200 Subject: Refactoring of models. Document container - declare only id --- ishtar_common/forms_common.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'ishtar_common/forms_common.py') diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 49d1829bc..d6d4e197a 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -1281,12 +1281,18 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): model=models.Format, label=_("Format"), choices=[], required=False) scale = forms.CharField(label=_("Scale"), max_length=30, required=False) - container = widgets.ModelJQueryAutocompleteField( + container_id = forms.IntegerField( label=_("Current container"), - model=Container, required=False) - container_ref = widgets.ModelJQueryAutocompleteField( + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-container'), + associated_model=Container, new=True), + validators=[models.valid_id(Container)], required=False) + container_ref_id = forms.IntegerField( label=_("Reference container"), - model=Container, required=False) + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-container'), + associated_model=Container, new=True), + validators=[models.valid_id(Container)], required=False) authors = widgets.Select2MultipleField( label=_("Authors"), required=False, model=models.Author, remote="autocomplete-author") @@ -1378,7 +1384,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): 'receipt_date_in_documentation', 'creation_date', 'publisher', 'language', 'isbn', 'issn', 'licenses', 'source', 'source_free_input', - 'container', "container_ref", + 'container_id', "container_ref_id", 'comment', 'description', 'additional_information', 'duplicate' ] @@ -1390,7 +1396,7 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): 'receipt_date': FormHeader(_("Dates")), 'publisher': FormHeader(_("Publishing"), collapse=True), 'source': FormHeader(_("Source"), collapse=True), - 'container': FormHeader(_("Warehouse"), collapse=True), + 'container_id': FormHeader(_("Warehouse"), collapse=True), 'comment': FormHeader(_("Advanced"), collapse=True), 'finds': FormHeader(_("Related items")), } -- cgit v1.2.3