diff options
| -rw-r--r-- | archaeological_finds/forms.py | 5 | ||||
| -rw-r--r-- | archaeological_finds/models.py | 7 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | 
3 files changed, 8 insertions, 6 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 81299869f..216c1ae75 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -114,7 +114,7 @@ class FindForm(ManageOldType, forms.Form):          label=_(u"Preservation type"), choices=[],          widget=forms.CheckboxSelectMultiple, required=False)      integritie = forms.MultipleChoiceField( -        label=_(u"Integrity"), choices=[], +        label=_(u"Integrity / interest"), choices=[],          widget=forms.CheckboxSelectMultiple, required=False)      remarkabilitie = forms.MultipleChoiceField(          label=_(u"Remarkability"), choices=[], @@ -243,7 +243,8 @@ class FindSelect(TableSelect):          choices=[], label=_(u"Preservation type"))      conservatory_state = forms.ChoiceField(label=_(u"Conservatory state"),                                             choices=[]) -    integrities = forms.ChoiceField(label=_(u"Integrity"), choices=[]) +    integrities = forms.ChoiceField(label=_(u"Integrity / interest"), +                                    choices=[])      remarkabilities = forms.ChoiceField(label=_(u"Remarkability"),                                          choices=[])      base_finds__find__description = forms.CharField(label=_(u"Description")) diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 5811ded6e..1c6a679c2 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -71,8 +71,8 @@ class PreservationType(GeneralType):  class IntegrityType(GeneralType):      class Meta: -        verbose_name = _(u"Integrity type") -        verbose_name_plural = _(u"Integrity types") +        verbose_name = _(u"Integrity / interest type") +        verbose_name_plural = _(u"Integrity / interest types")          ordering = ('label',) @@ -355,7 +355,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):      object_types = models.ManyToManyField(          ObjectType, verbose_name=_(u"Object types"), related_name='find')      integrities = models.ManyToManyField( -        IntegrityType, verbose_name=_(u"Integrity"), related_name='find') +        IntegrityType, verbose_name=_(u"Integrity / Interest"), +        related_name='find')      remarkabilities = models.ManyToManyField(          RemarkabilityType, verbose_name=_(u"Remarkability"),          related_name='find') diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index fbd7cec1a..0cc1616b2 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -57,7 +57,7 @@  {% endif %}  {% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %}  {% field_li_multiple "Object types" item.object_types %} -{% field_li_multiple "Integrity" item.integrities %} +{% field_li_multiple "Integrity / interest" item.integrities %}  {% field_li_multiple "Remarkability" item.remarkabilities %}  {% field_li "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %}  {% if item.CHECK_DICT %}  | 
