diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-15 10:01:02 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-03-15 10:01:02 +0100 |
commit | 3a6b035c27171805c813d3ec4283d3e0f56a1da4 (patch) | |
tree | 56b29b6515cc0855b21432fe965d8773e4368ee5 | |
parent | 791c7c025fc591d443587e6f7eaf6e08d9ea69fc (diff) | |
download | Ishtar-3a6b035c27171805c813d3ec4283d3e0f56a1da4.tar.bz2 Ishtar-3a6b035c27171805c813d3ec4283d3e0f56a1da4.zip |
Container - fix length for different character fields (refs #3993) - fix length for URLs field in sources -> 1000 (refs #3991)
-rw-r--r-- | archaeological_context_records/migrations/0018_auto_20180315_1000.py | 20 | ||||
-rw-r--r-- | archaeological_finds/migrations/0019_auto_20180315_1000.py | 40 | ||||
-rw-r--r-- | archaeological_operations/migrations/0021_auto_20180315_1000.py | 20 | ||||
-rw-r--r-- | archaeological_warehouse/migrations/0015_auto_20180315_1000.py | 35 | ||||
-rw-r--r-- | archaeological_warehouse/models.py | 11 | ||||
-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 |
8 files changed, 153 insertions, 8 deletions
diff --git a/archaeological_context_records/migrations/0018_auto_20180315_1000.py b/archaeological_context_records/migrations/0018_auto_20180315_1000.py new file mode 100644 index 000000000..03ccd847e --- /dev/null +++ b/archaeological_context_records/migrations/0018_auto_20180315_1000.py @@ -0,0 +1,20 @@ +# -*- 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 = [ + ('archaeological_context_records', '0017_auto_20180306_1121'), + ] + + operations = [ + migrations.AlterField( + model_name='contextrecordsource', + name='associated_url', + field=models.URLField(blank=True, max_length=1000, null=True, verbose_name='Numerical ressource (web address)'), + ), + ] diff --git a/archaeological_finds/migrations/0019_auto_20180315_1000.py b/archaeological_finds/migrations/0019_auto_20180315_1000.py new file mode 100644 index 000000000..abdb44ef8 --- /dev/null +++ b/archaeological_finds/migrations/0019_auto_20180315_1000.py @@ -0,0 +1,40 @@ +# -*- 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 = [ + ('archaeological_finds', '0018_auto_20180303_0812'), + ] + + operations = [ + migrations.AlterField( + model_name='find', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Denomination'), + ), + migrations.AlterField( + model_name='findsource', + name='associated_url', + field=models.URLField(blank=True, max_length=1000, null=True, verbose_name='Numerical ressource (web address)'), + ), + migrations.AlterField( + model_name='historicalfind', + name='denomination', + field=models.TextField(blank=True, null=True, verbose_name='Denomination'), + ), + migrations.AlterField( + model_name='treatmentfilesource', + name='associated_url', + field=models.URLField(blank=True, max_length=1000, null=True, verbose_name='Numerical ressource (web address)'), + ), + migrations.AlterField( + model_name='treatmentsource', + name='associated_url', + field=models.URLField(blank=True, max_length=1000, null=True, verbose_name='Numerical ressource (web address)'), + ), + ] diff --git a/archaeological_operations/migrations/0021_auto_20180315_1000.py b/archaeological_operations/migrations/0021_auto_20180315_1000.py new file mode 100644 index 000000000..a8565402d --- /dev/null +++ b/archaeological_operations/migrations/0021_auto_20180315_1000.py @@ -0,0 +1,20 @@ +# -*- 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 = [ + ('archaeological_operations', '0020_auto_20180303_1159'), + ] + + operations = [ + migrations.AlterField( + model_name='operationsource', + name='associated_url', + field=models.URLField(blank=True, max_length=1000, null=True, verbose_name='Numerical ressource (web address)'), + ), + ] diff --git a/archaeological_warehouse/migrations/0015_auto_20180315_1000.py b/archaeological_warehouse/migrations/0015_auto_20180315_1000.py new file mode 100644 index 000000000..81c3189c4 --- /dev/null +++ b/archaeological_warehouse/migrations/0015_auto_20180315_1000.py @@ -0,0 +1,35 @@ +# -*- 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 = [ + ('archaeological_warehouse', '0014_auto_20180228_1741'), + ] + + operations = [ + migrations.AlterField( + model_name='container', + name='cached_label', + field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Localisation'), + ), + migrations.AlterField( + model_name='container', + name='cached_location', + field=models.TextField(blank=True, db_index=True, null=True, verbose_name='Cached location'), + ), + migrations.AlterField( + model_name='container', + name='old_reference', + field=models.TextField(blank=True, null=True, verbose_name='Old reference'), + ), + migrations.AlterField( + model_name='container', + name='reference', + field=models.TextField(verbose_name='Container ref.'), + ), + ] diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 68f5181b7..33646ef9b 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -297,15 +297,14 @@ class Container(LightHistorizedItem, ImageModel): related_name='owned_containers') container_type = models.ForeignKey(ContainerType, verbose_name=_("Container type")) - reference = models.CharField(_(u"Container ref."), max_length=200) + reference = models.TextField(_(u"Container ref.")) comment = models.TextField(_(u"Comment"), null=True, blank=True) - cached_label = models.CharField(_(u"Localisation"), max_length=500, - null=True, blank=True, db_index=True) - cached_location = models.CharField(_(u"Cached location"), max_length=500, + cached_label = models.TextField(_(u"Localisation"), null=True, blank=True, + db_index=True) + cached_location = models.TextField(_(u"Cached location"), null=True, blank=True, db_index=True) index = models.IntegerField(u"Container ID", default=0) - old_reference = models.CharField(_(u"Old reference"), max_length=200, - blank=True, null=True) + old_reference = models.TextField(_(u"Old reference"), blank=True, null=True) external_id = models.TextField(_(u"External ID"), blank=True, null=True) auto_external_id = models.BooleanField( _(u"External ID is set automatically"), default=False) 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")) |