diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/forms_common.py | 3 | ||||
| -rw-r--r-- | ishtar_common/migrations/0034_auto_20180315_1000.py | 30 | ||||
| -rw-r--r-- | ishtar_common/models.py | 2 |
3 files changed, 33 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 940ce99b8..94dd7b8ee 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -899,7 +899,8 @@ class SourceForm(CustomForm, ManageOldType): label=_(u"Internal reference"), validators=[validators.MaxLengthValidator(100)], required=False) associated_url = forms.URLField( - required=False, label=_(u"Numerical ressource (web address)")) + max_length=1000, required=False, + label=_(u"Numerical ressource (web address)")) receipt_date = forms.DateField(label=_(u"Receipt date"), required=False, widget=DatePicker) creation_date = forms.DateField(label=_(u"Creation date"), required=False, diff --git a/ishtar_common/migrations/0034_auto_20180315_1000.py b/ishtar_common/migrations/0034_auto_20180315_1000.py new file mode 100644 index 000000000..0b32d5e2e --- /dev/null +++ b/ishtar_common/migrations/0034_auto_20180315_1000.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-15 10:00 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0033_auto_20180306_1054'), + ] + + operations = [ + migrations.AlterField( + model_name='import', + name='end_date', + field=models.DateTimeField(auto_now_add=True, null=True, verbose_name='End date'), + ), + migrations.AlterField( + model_name='import', + name='state', + field=models.CharField(choices=[(b'C', 'Created'), (b'AP', 'Analyse in progress'), (b'A', 'Analysed'), (b'P', 'Import pending'), (b'IQ', 'Import in queue'), (b'IP', 'Import in progress'), (b'FE', 'Finished with errors'), (b'F', 'Finished'), (b'AC', 'Archived')], default='C', max_length=2, verbose_name='State'), + ), + migrations.AlterField( + model_name='ishtarsiteprofile', + name='archaeological_site_label', + field=models.CharField(choices=[(b'site', 'Site'), (b'entity', 'Archaeological entity')], default=b'site', max_length=200, verbose_name='Archaeological site type'), + ), + ] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 327922943..b634d93d7 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2825,7 +2825,7 @@ class Source(OwnPerms, ImageModel, FullSearch): authors = models.ManyToManyField(Author, verbose_name=_(u"Authors"), related_name="%(class)s_related") associated_url = models.URLField( - blank=True, null=True, + blank=True, null=True, max_length=1000, verbose_name=_(u"Numerical ressource (web address)")) receipt_date = models.DateField(blank=True, null=True, verbose_name=_(u"Receipt date")) |