summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-02-22 15:53:17 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:21:00 +0100
commit627cd8452cbd6f51f59978067d3bf56af2c91edb (patch)
tree5579347059dbf480d471be5a7de4b1e9038d967b
parent261f9d2bd15af002c8b35d917b4aadb40794846a (diff)
downloadIshtar-627cd8452cbd6f51f59978067d3bf56af2c91edb.tar.bz2
Ishtar-627cd8452cbd6f51f59978067d3bf56af2c91edb.zip
Area reference -> text
-rw-r--r--.gitignore1
-rw-r--r--archaeological_context_records/migrations/0107_auto_20220222_1534.py (renamed from archaeological_context_records/migrations/0107_auto_20220218_1050.py)4
-rw-r--r--archaeological_finds/migrations/0109_auto_20220222_1534.py (renamed from archaeological_finds/migrations/0109_auto_20220218_1050.py)4
-rw-r--r--archaeological_operations/migrations/0109_auto_20220222_1534.py (renamed from archaeological_operations/migrations/0109_auto_20220218_1049.py)4
-rw-r--r--archaeological_warehouse/migrations/0113_auto_20220222_1535.py (renamed from archaeological_warehouse/migrations/0113_auto_20220218_1050.py)4
-rw-r--r--ishtar_common/migrations/0220_auto_20220222_1534.py (renamed from ishtar_common/migrations/0220_auto_20220218_1049.py)7
-rw-r--r--ishtar_common/models.py2
7 files changed, 16 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 39efb2876..245d7bf56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ example_project/static
example_project/celery_app.py
example_project/logs
example_project/__init__.py
+example_project/logs
docs/*/build
Makefile
oook_replace
diff --git a/archaeological_context_records/migrations/0107_auto_20220218_1050.py b/archaeological_context_records/migrations/0107_auto_20220222_1534.py
index 446dd2758..319c97824 100644
--- a/archaeological_context_records/migrations/0107_auto_20220218_1050.py
+++ b/archaeological_context_records/migrations/0107_auto_20220222_1534.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-02-18 10:50
+# Generated by Django 2.2.24 on 2022-02-22 15:34
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
@@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0220_auto_20220218_1049'),
+ ('ishtar_common', '0220_auto_20220222_1534'),
('archaeological_context_records', '0106_auto_20210326_1434'),
]
diff --git a/archaeological_finds/migrations/0109_auto_20220218_1050.py b/archaeological_finds/migrations/0109_auto_20220222_1534.py
index d8573fbf9..0e7cafdde 100644
--- a/archaeological_finds/migrations/0109_auto_20220218_1050.py
+++ b/archaeological_finds/migrations/0109_auto_20220222_1534.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-02-18 10:50
+# Generated by Django 2.2.24 on 2022-02-22 15:34
import archaeological_finds.models_treatments
import django.contrib.postgres.fields.jsonb
@@ -9,7 +9,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0220_auto_20220218_1049'),
+ ('ishtar_common', '0220_auto_20220222_1534'),
('archaeological_finds', '0108_auto_20210602_2234'),
]
diff --git a/archaeological_operations/migrations/0109_auto_20220218_1049.py b/archaeological_operations/migrations/0109_auto_20220222_1534.py
index 0d29c6956..c815afab9 100644
--- a/archaeological_operations/migrations/0109_auto_20220218_1049.py
+++ b/archaeological_operations/migrations/0109_auto_20220222_1534.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-02-18 10:49
+# Generated by Django 2.2.24 on 2022-02-22 15:34
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
@@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0220_auto_20220218_1049'),
+ ('ishtar_common', '0220_auto_20220222_1534'),
('archaeological_operations', '0108_auto_20220214_1920'),
]
diff --git a/archaeological_warehouse/migrations/0113_auto_20220218_1050.py b/archaeological_warehouse/migrations/0113_auto_20220222_1535.py
index ec65b1214..16b1265d3 100644
--- a/archaeological_warehouse/migrations/0113_auto_20220218_1050.py
+++ b/archaeological_warehouse/migrations/0113_auto_20220222_1535.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-02-18 10:50
+# Generated by Django 2.2.24 on 2022-02-22 15:35
import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
@@ -8,7 +8,7 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
- ('ishtar_common', '0220_auto_20220218_1049'),
+ ('ishtar_common', '0220_auto_20220222_1534'),
('archaeological_warehouse', '0112_auto_20210308_1628'),
]
diff --git a/ishtar_common/migrations/0220_auto_20220218_1049.py b/ishtar_common/migrations/0220_auto_20220222_1534.py
index 2c64c3e29..b6f4db445 100644
--- a/ishtar_common/migrations/0220_auto_20220218_1049.py
+++ b/ishtar_common/migrations/0220_auto_20220222_1534.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.2.24 on 2022-02-18 10:49
+# Generated by Django 2.2.24 on 2022-02-22 15:34
import django.contrib.gis.db.models.fields
import django.core.validators
@@ -82,6 +82,11 @@ class Migration(migrations.Migration):
name='spatialreferencesystem',
options={'ordering': ('order', 'label'), 'verbose_name': 'Spatial reference system', 'verbose_name_plural': 'Spatial reference systems'},
),
+ migrations.AlterField(
+ model_name='area',
+ name='reference',
+ field=models.TextField(blank=True, default='', verbose_name='Reference'),
+ ),
migrations.CreateModel(
name='GeoVectorData',
fields=[
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index a1f91282e..e86b8a55d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -2242,7 +2242,7 @@ class Area(HierarchicalType):
towns = models.ManyToManyField(
Town, verbose_name=_("Towns"), blank=True, related_name="areas"
)
- reference = models.CharField(_("Reference"), max_length=200, blank=True, null=True)
+ reference = models.TextField(_("Reference"), blank=True, default="")
parent = models.ForeignKey(
"self",
blank=True,