diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/forms.py | 16 | ||||
| -rw-r--r-- | archaeological_operations/migrations/0110_auto_20220917_1818.py | 23 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 19 | 
3 files changed, 38 insertions, 20 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 6b5bfbd51..4609813b8 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -1550,13 +1550,11 @@ class AdministrativeActOpeSelect(TableSelect):          ))      year = forms.IntegerField(label=_("Year"))      index = forms.IntegerField(label=_("Index")) -    if settings.COUNTRY == 'fr': -        ref_sra = forms.CharField(label="Autre référence", -                                  max_length=15) -        operation__code_patriarche = forms.CharField( -            max_length=500, -            widget=OAWidget, -            label="Code PATRIARCHE") +    ref_sra = forms.CharField(label=_("Other reference"), max_length=200) +    operation__code_patriarche = forms.CharField( +        max_length=500, +        widget=OAWidget, +        label="Code PATRIARCHE")      act_type = forms.ChoiceField(label=_("Act type"), choices=[])      indexed = forms.NullBooleanField(label=_("Indexed?"))      operation__towns = get_town_field() @@ -1629,9 +1627,7 @@ class AdministrativeActForm(CustomForm, ManageOldType):                                   widget=forms.Textarea, required=False)      signature_date = DateField(label=_("Signature date"), required=False)      comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) -    if settings.COUNTRY == 'fr': -        ref_sra = forms.CharField(label="Autre référence", max_length=15, -                                  required=False) +    ref_sra = forms.CharField(label=_("Other reference"), max_length=200, required=False)      TYPES = [          FieldType('act_type', models.ActType, diff --git a/archaeological_operations/migrations/0110_auto_20220917_1818.py b/archaeological_operations/migrations/0110_auto_20220917_1818.py new file mode 100644 index 000000000..b45bc19ac --- /dev/null +++ b/archaeological_operations/migrations/0110_auto_20220917_1818.py @@ -0,0 +1,23 @@ +# Generated by Django 2.2.24 on 2022-09-17 18:18 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + +    dependencies = [ +        ('archaeological_operations', '0109_auto_20220711_1025'), +    ] + +    operations = [ +        migrations.AlterField( +            model_name='administrativeact', +            name='ref_sra', +            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Other reference'), +        ), +        migrations.AlterField( +            model_name='historicaladministrativeact', +            name='ref_sra', +            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Other reference'), +        ), +    ] diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 370b3c9b2..13b784539 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -2696,16 +2696,15 @@ class AdministrativeAct(DocumentItem, BaseHistorizedItem, OwnPerms, ValueGetter)      signature_date = models.DateField(_("Signature date"), blank=True, null=True)      year = models.IntegerField(_("Year"), blank=True, null=True)      act_object = models.TextField(_("Object"), blank=True, default="") -    if settings.COUNTRY == "fr": -        ref_sra = models.CharField( -            "Référence SRA", max_length=15, blank=True, null=True -        ) -        departments_label = models.TextField( -            _("Departments"), -            blank=True, -            default="", -            help_text=_("Cached values get from associated departments"), -        ) +    ref_sra = models.CharField( +        _("Other reference"), max_length=200, blank=True, null=True +    ) +    departments_label = models.TextField( +        _("Departments"), +        blank=True, +        default="", +        help_text=_("Cached values get from associated departments"), +    )      towns_label = models.TextField(          _("Towns"),          blank=True,  | 
