diff options
| -rw-r--r-- | archaeological_finds/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 10 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/forms.py | 2 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 16 |
6 files changed, 17 insertions, 19 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 9701c4121..8483e5277 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -1301,7 +1301,7 @@ class PreservationForm(CustomForm, ManageOldType): "integritie": models.IntegrityType, } integritie = forms.MultipleChoiceField( - label=_("Integrity / interest"), + label=_("Integrity"), choices=[], widget=widgets.Select2Multiple, required=False, @@ -1789,7 +1789,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): check_date__before = forms.DateField( label=_("Check date before"), widget=DatePicker ) - integrities = forms.ChoiceField(label=_("Integrity / interest"), choices=[]) + integrities = forms.ChoiceField(label=_("Integrity"), choices=[]) remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[]) conservatory_state = forms.ChoiceField(label=_("Conservatory state"), choices=[]) conservatory_comment = forms.CharField(label=_("Conservatory comment")) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 757f38899..8ef32c8de 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -234,8 +234,8 @@ post_delete.connect(post_save_cache, sender=TreatmentType) class IntegrityType(GeneralType): class Meta: - verbose_name = _("Integrity / interest type") - verbose_name_plural = _("Integrity / interest types") + verbose_name = _("Integrity type") + verbose_name_plural = _("Integrity types") ordering = ("label",) ADMIN_SECTION = _("Finds") @@ -1176,7 +1176,7 @@ class Find( ("object_types__label", _("Object type")), ("preservation_to_considers__label", _("Recommended treatments")), ("conservatory_state__label", _("Conservatory state")), - ("integrities__label", _("Integrity / interest")), + ("integrities__label", _("Integrity")), ("remarkabilities__label", _("Remarkability")), ("communicabilities__label", _("Communicability")), ("checked_type__label", _("Check")), @@ -2060,7 +2060,7 @@ class Find( ) integrities = models.ManyToManyField( IntegrityType, - verbose_name=_("Integrity / interest"), + verbose_name=_("Integrity"), related_name="find", blank=True, ) @@ -2312,6 +2312,8 @@ class Find( @property def has_museum_section(self): + if get_current_profile().museum and self.mark: + return True for field in self._meta.fields: if not field.name.startswith("museum_"): continue diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 82558629e..18cb03374 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -310,7 +310,7 @@ {% if item.integrities_count or item.remarkabilities_count or item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} <h3>{% trans "Preservation" %}</h3> <div class='row'> - {% field_flex_multiple_obj "Integrity / interest" item 'integrities' %} + {% field_flex_multiple_obj "Integrity" item 'integrities' %} {% field_flex_multiple_obj "Remarkability" item 'remarkabilities' %} {% field_flex "Conservatory state" item.conservatory_state %} {% field_flex_multiple_obj "Alteration" item 'alterations' %} diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index 56672e007..f903ec89c 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -305,7 +305,7 @@ {% if item.integrities_count or item.remarkabilities_count or item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} <h3>{% trans "Preservation" %}</h3> <div class='row'> - {% field_flex_multiple_obj "Integrity / interest" item 'integrities' %} + {% field_flex_multiple_obj "Integrity" item 'integrities' %} {% field_flex_multiple_obj "Remarkability" item 'remarkabilities' %} {% field_flex "Conservatory state" item.conservatory_state %} {% field_flex_multiple_obj "Alteration" item 'alterations' %} diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index f083785b5..6845a2771 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -586,7 +586,7 @@ class ContainerSelect(DocumentItemSelect): reverse_lazy("autocomplete-objecttype"), associated_model=ObjectType ), ) - integrities = forms.ChoiceField(label=_("Integrity / interest"), choices=[]) + integrities = forms.ChoiceField(label=_("Integrity"), choices=[]) remarkabilities = forms.ChoiceField(label=_("Remarkability"), choices=[]) conservatory_state = forms.ChoiceField(label=_("Conservatory state"), choices=[]) alterations = forms.ChoiceField(label=_("Alteration"), choices=[]) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 71f97b689..f1d0939c1 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3797,8 +3797,8 @@ msgstr "Mobilier - 030 - Conservation" #: archaeological_finds/models_finds.py:1179 #: archaeological_finds/models_finds.py:2062 #: archaeological_warehouse/forms.py:589 -msgid "Integrity / interest" -msgstr "Intégrité / intérêt" +msgid "Integrity" +msgstr "Intégrité" #: archaeological_finds/forms.py:1331 archaeological_finds/forms.py:1800 #: archaeological_finds/models_finds.py:1177 @@ -4790,12 +4790,12 @@ msgid "Treatments" msgstr "Traitements" #: archaeological_finds/models_finds.py:237 -msgid "Integrity / interest type" -msgstr "Type d'intégrité / intérêt" +msgid "Integrity type" +msgstr "Type d'intégrité" #: archaeological_finds/models_finds.py:238 -msgid "Integrity / interest types" -msgstr "Types d'intégrité / intérêt" +msgid "Integrity types" +msgstr "Types d'intégrité" #: archaeological_finds/models_finds.py:249 #: ishtar_common/models_imports.py:1091 @@ -13139,10 +13139,6 @@ msgstr "Matériau" msgid "Warehouse division" msgstr "Division de lieu de conservation" -#: ishtar_common/models_imports.py:1090 -msgid "Integrity type" -msgstr "Type d'intégrité" - #: ishtar_common/models_imports.py:1100 msgid "Identification type" msgstr "Type d'identification" |