diff options
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 7e217d06c..5dc6910ea 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -919,7 +919,7 @@ class QAFindFormMulti(QAForm): "qa_alteration_causes": models.AlterationCauseType, "qa_checked_type": models.CheckedType, "qa_period": Period, - "qa_conservatory_state": models.ConservatoryState, + "qa_conservatory_states": models.ConservatoryState, "qa_treatment_emergency": models.TreatmentEmergencyType, "qa_museum_collection_entry_mode": models.CollectionEntryModeType, "qa_museum_owner_institution": Organization, @@ -940,7 +940,6 @@ class QAFindFormMulti(QAForm): "qa_manufacturing_place", "qa_checked_type", "qa_check_date", - "qa_conservatory_state", "qa_treatment_emergency", "qa_appraisal_date", "qa_insurance_value", # 'qa_collection', @@ -1123,9 +1122,7 @@ class QAFindFormMulti(QAForm): qa_alteration_causes = widgets.Select2MultipleField( label=_("Alteration cause"), required=False ) - qa_conservatory_state = forms.ChoiceField( - label=_("Conservatory state"), required=False, choices=[] - ) + qa_conservatory_states = widgets.Select2MultipleField(label=_("Conservatory states"), required=False) qa_treatment_emergency = forms.ChoiceField( label=_("Treatment emergency"), choices=[], required=False ) @@ -1176,7 +1173,7 @@ class QAFindFormMulti(QAForm): FieldType("qa_alteration_causes", models.AlterationCauseType, is_multiple=True), FieldType("qa_remarkabilities", models.RemarkabilityType, is_multiple=True), FieldType("qa_checked_type", models.CheckedType), - FieldType("qa_conservatory_state", models.ConservatoryState), + FieldType("qa_conservatory_states", models.ConservatoryState, is_multiple=True), FieldType("qa_treatment_emergency", models.TreatmentEmergencyType), FieldType("qa_period", Period, is_multiple=True), FieldType("qa_museum_collection_entry_mode", models.CollectionEntryModeType), @@ -1475,6 +1472,7 @@ class PreservationForm(CustomForm, ManageOldType): "preservation_to_consider", "integritie", "remarkabilitie", + "conservatory_state", ] associated_models = { "alteration": models.AlterationType, @@ -1497,8 +1495,11 @@ class PreservationForm(CustomForm, ManageOldType): widget=widgets.Select2Multiple, required=False, ) - conservatory_state = forms.ChoiceField( - label=_("Conservatory state"), choices=[], required=False + conservatory_state = forms.MultipleChoiceField( + label=_("Conservatory states"), + choices=[], + widget=widgets.Select2Multiple, + required=False, ) alteration = forms.MultipleChoiceField( label=_("Alteration"), @@ -1531,13 +1532,13 @@ class PreservationForm(CustomForm, ManageOldType): ) TYPES = [ - FieldType("conservatory_state", models.ConservatoryState), FieldType("treatment_emergency", models.TreatmentEmergencyType), FieldType("preservation_to_consider", models.TreatmentType, True), FieldType("alteration", models.AlterationType, True), FieldType("alteration_cause", models.AlterationCauseType, True), FieldType("integritie", models.IntegrityType, is_multiple=True), FieldType("remarkabilitie", models.RemarkabilityType, is_multiple=True), + FieldType("conservatory_state", models.ConservatoryState, is_multiple=True), ] def __init__(self, *args, **kwargs): @@ -1651,7 +1652,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): ( "integrities", "remarkabilities", - "conservatory_state", + "conservatory_states", "conservatory_comment", "alterations", "alteration_causes", @@ -1984,7 +1985,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): ) integrities = forms.ChoiceField(label=_("Integrity"), choices=[]) remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[]) - conservatory_state = forms.ChoiceField(label=_("Conservatory state"), choices=[]) + conservatory_states = forms.ChoiceField(label=_("Conservatory states"), choices=[]) conservatory_comment = forms.CharField(label=_("Conservatory comment")) alterations = forms.ChoiceField(label=_("Alteration"), choices=[]) alteration_causes = forms.ChoiceField(label=_("Alteration cause"), choices=[]) @@ -2088,7 +2089,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): museum_purchase_price = forms.CharField(label=_("Museum - Purchase price")) TYPES = PeriodSelect.TYPES + [ - FieldType("conservatory_state", models.ConservatoryState), + FieldType("conservatory_states", models.ConservatoryState), FieldType("base_finds__batch", models.BatchType), FieldType("preservation_to_considers", models.TreatmentType), FieldType("integrities", models.IntegrityType), |