summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/migrations/0104_auto_20201104_0959.py (renamed from archaeological_context_records/migrations/0104_auto_20201007_1215.py)6
-rw-r--r--archaeological_files/migrations/0103_auto_20201104_1000.py (renamed from archaeological_files/migrations/0103_auto_20201007_1215.py)10
-rw-r--r--archaeological_finds/migrations/0106_auto_20201104_1000.py (renamed from archaeological_finds/migrations/0106_auto_20201007_1215.py)14
-rw-r--r--archaeological_operations/migrations/0104_auto_20201104_0959.py (renamed from archaeological_operations/migrations/0104_auto_20201007_1215.py)10
-rw-r--r--archaeological_warehouse/migrations/0105_auto_20201104_1000.py (renamed from archaeological_warehouse/migrations/0105_auto_20201007_1215.py)8
-rw-r--r--ishtar_common/migrations/0205_auto_20201104_0959.py (renamed from ishtar_common/migrations/0205_auto_20201007_1215.py)40
-rw-r--r--ishtar_common/models_common.py3
7 files changed, 28 insertions, 63 deletions
diff --git a/archaeological_context_records/migrations/0104_auto_20201007_1215.py b/archaeological_context_records/migrations/0104_auto_20201104_0959.py
index cb59f180c..3b13ec367 100644
--- a/archaeological_context_records/migrations/0104_auto_20201007_1215.py
+++ b/archaeological_context_records/migrations/0104_auto_20201104_0959.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 09:59
from __future__ import unicode_literals
from django.db import migrations, models
@@ -15,11 +15,11 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='contextrecord',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalcontextrecord',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
]
diff --git a/archaeological_files/migrations/0103_auto_20201007_1215.py b/archaeological_files/migrations/0103_auto_20201104_1000.py
index d6f626fa9..566efa939 100644
--- a/archaeological_files/migrations/0103_auto_20201007_1215.py
+++ b/archaeological_files/migrations/0103_auto_20201104_1000.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 10:00
from __future__ import unicode_literals
from django.db import migrations, models
-import ishtar_common.models
+import ishtar_common.utils
class Migration(migrations.Migration):
@@ -16,17 +16,17 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='file',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='file',
name='qrcode',
- field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.models.get_image_path),
+ field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path),
),
migrations.AddField(
model_name='historicalfile',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalfile',
diff --git a/archaeological_finds/migrations/0106_auto_20201007_1215.py b/archaeological_finds/migrations/0106_auto_20201104_1000.py
index 842173d1e..60fee9e8b 100644
--- a/archaeological_finds/migrations/0106_auto_20201007_1215.py
+++ b/archaeological_finds/migrations/0106_auto_20201104_1000.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 10:00
from __future__ import unicode_literals
from django.db import migrations, models
-import ishtar_common.models
+import ishtar_common.utils
class Migration(migrations.Migration):
@@ -16,22 +16,22 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='basefind',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='basefind',
name='qrcode',
- field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.models.get_image_path),
+ field=models.ImageField(blank=True, max_length=255, null=True, upload_to=ishtar_common.utils.get_image_path),
),
migrations.AddField(
model_name='find',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalbasefind',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalbasefind',
@@ -41,6 +41,6 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='historicalfind',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
]
diff --git a/archaeological_operations/migrations/0104_auto_20201007_1215.py b/archaeological_operations/migrations/0104_auto_20201104_0959.py
index fa61cf836..356f5855c 100644
--- a/archaeological_operations/migrations/0104_auto_20201007_1215.py
+++ b/archaeological_operations/migrations/0104_auto_20201104_0959.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 09:59
from __future__ import unicode_literals
from django.db import migrations, models
@@ -19,21 +19,21 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='archaeologicalsite',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalarchaeologicalsite',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicaloperation',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='operation',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
]
diff --git a/archaeological_warehouse/migrations/0105_auto_20201007_1215.py b/archaeological_warehouse/migrations/0105_auto_20201104_1000.py
index 9d009bed1..a01e39e1b 100644
--- a/archaeological_warehouse/migrations/0105_auto_20201007_1215.py
+++ b/archaeological_warehouse/migrations/0105_auto_20201104_1000.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 10:00
from __future__ import unicode_literals
from django.db import migrations, models
@@ -15,16 +15,16 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='container',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='historicalwarehouse',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='warehouse',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
]
diff --git a/ishtar_common/migrations/0205_auto_20201007_1215.py b/ishtar_common/migrations/0205_auto_20201104_0959.py
index 41a931843..e6cb86081 100644
--- a/ishtar_common/migrations/0205_auto_20201007_1215.py
+++ b/ishtar_common/migrations/0205_auto_20201104_0959.py
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-
-# Generated by Django 1.11.27 on 2020-10-07 12:15
+# Generated by Django 1.11.27 on 2020-11-04 09:59
from __future__ import unicode_literals
from django.db import migrations, models
-import django.db.models.deletion
class Migration(migrations.Migration):
@@ -16,7 +15,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='document',
name='complete_identifier',
- field=models.TextField(blank=True, verbose_name='Complete identifier'),
+ field=models.TextField(blank=True, null=True, verbose_name='Complete identifier'),
),
migrations.AddField(
model_name='ishtarsiteprofile',
@@ -63,39 +62,4 @@ class Migration(migrations.Migration):
name='warehouse_complete_identifier',
field=models.TextField(default='', help_text='Formula to manage warehouse complete identifier.', verbose_name='Warehouse complete identifier'),
),
- migrations.AlterField(
- model_name='document',
- name='format_type',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.Format', verbose_name='Medium'),
- ),
- migrations.AlterField(
- model_name='document',
- name='publisher',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='publish', to='ishtar_common.Organization', verbose_name='Publisher'),
- ),
- migrations.AlterField(
- model_name='importercolumn',
- name='regexp_pre_filter',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.Regexp'),
- ),
- migrations.AlterField(
- model_name='importercolumn',
- name='value_format',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='columns', to='ishtar_common.ValueFormater'),
- ),
- migrations.AlterField(
- model_name='importertype',
- name='associated_models',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='importer_type_associated', to='ishtar_common.ImporterModel', verbose_name='Associated model'),
- ),
- migrations.AlterField(
- model_name='importertype',
- name='created_models',
- field=models.ManyToManyField(blank=True, help_text='Leave blank for no restrictions', related_name='importer_type_created', to='ishtar_common.ImporterModel', verbose_name='Models that can accept new items'),
- ),
- migrations.AlterField(
- model_name='importtarget',
- name='formater_type',
- field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='targets', to='ishtar_common.FormaterType'),
- ),
]
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index 8c5d60637..98d435ce9 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -2643,7 +2643,8 @@ class ImageContainerModel:
class CompleteIdentifierItem(models.Model, ImageContainerModel):
HAS_QR_CODE = True
- complete_identifier = models.TextField(_("Complete identifier"), blank=True)
+ complete_identifier = models.TextField(_("Complete identifier"),
+ blank=True, null=True)
qrcode = models.ImageField(upload_to=get_image_path, blank=True, null=True,
max_length=255)
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 13:57:17 +0000