diff options
| -rw-r--r-- | archaeological_context_records/forms.py | 20 | ||||
| -rw-r--r-- | archaeological_finds/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 3 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 7 | ||||
| -rw-r--r-- | docs/generate_values_doc.py | 2 |
5 files changed, 19 insertions, 15 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index e1b49bbe3..357f5ce13 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -106,23 +106,23 @@ class PeriodSelect(forms.Form): class RecordSelect(DocumentItemSelect, PeriodSelect): _model = models.ContextRecord - form_admin_name = _(u"Context record - 001 - Search") + form_admin_name = _("Context record - 001 - Search") form_slug = "contextrecord-001-search" search_vector = forms.CharField( - label=_(u"Full text search"), widget=widgets.SearchWidget( + label=_("Full text search"), widget=widgets.SearchWidget( 'archaeological-context-records', 'contextrecord' )) - label = forms.CharField(label=_(u"ID"), max_length=100) + label = forms.CharField(label=_("ID"), max_length=100) town = get_town_field() if settings.COUNTRY == 'fr': operation__code_patriarche = forms.CharField( max_length=500, widget=OAWidget, - label=_(u"Code PATRIARCHE")) - operation__year = forms.IntegerField(label=_(u"Operation's year")) + label=_("Code PATRIARCHE")) + operation__year = forms.IntegerField(label=_("Operation's year")) operation__operation_code = forms.IntegerField( - label=_(u"Operation's number (index by year)")) + label=_("Operation's number (index by year)")) archaeological_site = forms.IntegerField( label=_("Archaeological site"), widget=widgets.JQueryAutoComplete( @@ -130,12 +130,12 @@ class RecordSelect(DocumentItemSelect, PeriodSelect): associated_model=ArchaeologicalSite), validators=[valid_id(ArchaeologicalSite)]) ope_relation_types = forms.ChoiceField( - label=_(u"Search within related operations"), choices=[]) - unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) - parcel = forms.CharField(label=_(u"Parcel")) + label=_("Search within related operations"), choices=[]) + unit = forms.ChoiceField(label=_("Unit type"), choices=[]) + parcel = forms.CharField(label=_("Parcel")) has_finds = forms.NullBooleanField(label=_("Has finds")) cr_relation_types = forms.ChoiceField( - label=_(u"Search within relations"), choices=[]) + label=_("Search within relations"), choices=[]) TYPES = PeriodSelect.TYPES + [ FieldType('unit', models.Unit), diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index eabe25fa0..922866ffd 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -99,7 +99,7 @@ logger = logging.getLogger(__name__) class RecordFormSelection(CustomForm, forms.Form): form_label = _("Context record") - form_admin_name = _(u"Find - 010 - Context record choice") + form_admin_name = _("Find - 010 - Context record choice") form_slug = "find-010-contextrecord" base_models = ['get_first_base_find'] associated_models = {'get_first_base_find__context_record': ContextRecord} diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 6bb8d042e..494bb8a97 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1379,8 +1379,7 @@ class Find(BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, 'appraisal_date__gte'), 'cultural_attributions': SearchAltName( pgettext_lazy("key for text search", "cultural-attribution"), - 'cultural_attributions__label__iexact' - ), + 'cultural_attributions__label__iexact'), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) ALT_NAMES.update(DocumentItem.ALT_NAMES) diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index b2d7740a1..db573a650 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -1971,7 +1971,11 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): 'signature_date_after': 'signature_date__gte', 'year': 'signature_date__year', } - REVERSED_BOOL_FIELDS = ['index__isnull'] + REVERSED_BOOL_FIELDS = [ + 'index__isnull', 'documents__image__isnull', + 'documents__associated_url__isnull', + 'documents__associated_file__isnull', + ] RELATIVE_SESSION_NAMES = [('operation', 'operation__pk'), ('file', 'associated_file__pk')] COL_LABELS = { @@ -2127,6 +2131,7 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): ), } ALT_NAMES.update(BaseHistorizedItem.ALT_NAMES) + ALT_NAMES.update(DocumentItem.ALT_NAMES) UP_MODEL_QUERY = {} diff --git a/docs/generate_values_doc.py b/docs/generate_values_doc.py index 024aa6097..ed13f5c21 100644 --- a/docs/generate_values_doc.py +++ b/docs/generate_values_doc.py @@ -107,7 +107,7 @@ def get_values(tpl_model, model, excluded, model_types): if related_fields[key]: related_fields[key] += " - " related_fields[key] += help_text + " " - elif hasattr(field, "verbose_name"): + elif getattr(field, "verbose_name", None): type_desc = "" field_classes = [field.__class__.__name__] + [ sub.__name__ for sub in field.__class__.__subclasses__()] |