summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-18 18:25:13 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-02-18 18:25:13 +0100
commit9121004af3f6a86e642c74e1aa3391fd8302fa3e (patch)
tree04121047161602c1865feb95ad8af45c62c289b7
parentfbefeb8cf5cd64beeceefcddffc34b8637be4a5b (diff)
downloadIshtar-9121004af3f6a86e642c74e1aa3391fd8302fa3e.tar.bz2
Ishtar-9121004af3f6a86e642c74e1aa3391fd8302fa3e.zip
Add link between context records and sites (model)
-rw-r--r--archaeological_context_records/migrations/0016_auto_20180218_1824.py27
-rw-r--r--archaeological_context_records/models.py6
-rw-r--r--ishtar_common/migrations/0030_auto_20180218_1824.py20
3 files changed, 52 insertions, 1 deletions
diff --git a/archaeological_context_records/migrations/0016_auto_20180218_1824.py b/archaeological_context_records/migrations/0016_auto_20180218_1824.py
new file mode 100644
index 000000000..f459d9f29
--- /dev/null
+++ b/archaeological_context_records/migrations/0016_auto_20180218_1824.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-02-18 18:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('archaeological_operations', '0017_archaeologicalsite_towns'),
+ ('archaeological_context_records', '0015_contextrecordsource_search_vector'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='contextrecord',
+ name='archaeological_site',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='context_records', to='archaeological_operations.ArchaeologicalSite', verbose_name='Archaeological site'),
+ ),
+ migrations.AddField(
+ model_name='historicalcontextrecord',
+ name='archaeological_site',
+ field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='archaeological_operations.ArchaeologicalSite'),
+ ),
+ ]
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index e8cc60d43..bc007f44c 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -34,7 +34,8 @@ from ishtar_common.models import GeneralType, BaseHistorizedItem, \
HistoricalRecords, OwnPerms, ShortMenuItem, Source, GeneralRelationType,\
GeneralRecordRelations, post_delete_record_relation, \
ImageModel, post_save_cache, ValueGetter, BulkUpdatedItem, IshtarImage
-from archaeological_operations.models import Operation, Period, Parcel
+from archaeological_operations.models import Operation, Period, Parcel, \
+ ArchaeologicalSite
class DatingType(GeneralType):
@@ -263,6 +264,9 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
related_name='context_record')
operation = models.ForeignKey(Operation, verbose_name=_(u"Operation"),
related_name='context_record')
+ archaeological_site = models.ForeignKey(
+ ArchaeologicalSite, verbose_name=_(u"Archaeological site"),
+ blank=True, null=True, related_name='context_records')
label = models.CharField(_(u"ID"), max_length=200)
description = models.TextField(_(u"Description"), blank=True, null=True)
comment = models.TextField(_(u"General comment"), blank=True, null=True)
diff --git a/ishtar_common/migrations/0030_auto_20180218_1824.py b/ishtar_common/migrations/0030_auto_20180218_1824.py
new file mode 100644
index 000000000..e77c36935
--- /dev/null
+++ b/ishtar_common/migrations/0030_auto_20180218_1824.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.10 on 2018-02-18 18:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ishtar_common', '0029_auto_20180218_1708'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ishtarsiteprofile',
+ name='archaeological_site_label',
+ field=models.CharField(choices=[(b'site', 'Site'), (b'entity', 'Archaeological site')], default=b'site', max_length=200, verbose_name='Archaeological site type'),
+ ),
+ ]