diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-19 12:56:18 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-09-20 15:47:07 +0200 |
commit | 9e7b90546562144abc2c7195743ec34507f57cc2 (patch) | |
tree | 2e249bcdab3b92763d5723a957a16209105c0c22 /ishtar_common | |
parent | c10cdd8220589a4ce5bed01bc08cd11c92fdcdb5 (diff) | |
download | Ishtar-9e7b90546562144abc2c7195743ec34507f57cc2.tar.bz2 Ishtar-9e7b90546562144abc2c7195743ec34507f57cc2.zip |
🗃️ archaeological sites: new fields in database
- Types
- Current status
- Discovery status
- Discoverer
- Nature of site
- Interpretation level
- Precise locality
- Description
- Public description
Diffstat (limited to 'ishtar_common')
-rw-r--r-- | ishtar_common/migrations/0243_default_biographicalnote_permissions.py | 2 | ||||
-rw-r--r-- | ishtar_common/utils.py | 7 | ||||
-rw-r--r-- | ishtar_common/utils_migrations.py | 7 |
3 files changed, 8 insertions, 8 deletions
diff --git a/ishtar_common/migrations/0243_default_biographicalnote_permissions.py b/ishtar_common/migrations/0243_default_biographicalnote_permissions.py index a5399d9a8..fe367dd4d 100644 --- a/ishtar_common/migrations/0243_default_biographicalnote_permissions.py +++ b/ishtar_common/migrations/0243_default_biographicalnote_permissions.py @@ -1,7 +1,7 @@ # Generated by Django 2.2.24 on 2024-03-25 17:24 from django.db import migrations -from ishtar_common.utils import migrations_load_data +from ishtar_common.utils_migrations import migrations_load_data COLOR_WARNING = "\033[93m" COLOR_ENDC = "\033[0m" diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index b48b8f3a2..9aee643c4 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -63,7 +63,6 @@ from django.core.exceptions import SuspiciousOperation, ObjectDoesNotExist, \ ValidationError from django.core.files import File from django.core.files.storage import FileSystemStorage -from django.core.management import call_command from django.core.validators import EMPTY_VALUES, MaxValueValidator from django.db import models from django.db.models import Q @@ -1506,12 +1505,6 @@ def get_columns_from_class(cls, table_cols_attr="TABLE_COLS", dict_col_labels=Tr return table_cols, table_cols_label -def migrations_load_data(module_name, migration_filename): - json_path = os.sep.join(os.path.abspath(__file__).split(os.sep)[:-2] + [ - module_name, "migrations", migration_filename]) - call_command("loaddata", json_path) - - def create_default_areas(models=None, verbose=False): # can be used on migrations if models are provided if not models: diff --git a/ishtar_common/utils_migrations.py b/ishtar_common/utils_migrations.py index 1aead83e8..72697f48b 100644 --- a/ishtar_common/utils_migrations.py +++ b/ishtar_common/utils_migrations.py @@ -6,9 +6,16 @@ import sys import uuid from django.core.files import File +from django.core.management import call_command from django.db import connection +def migrations_load_data(module_name, migration_filename): + json_path = os.sep.join(os.path.abspath(__file__).split(os.sep)[:-2] + [ + module_name, "migrations", migration_filename]) + call_command("loaddata", json_path) + + def migrate_simple_image_to_m2m(base_model, image_model, rel_model, verbose=False): missing, moved = 0, 0 for item in base_model.objects.all(): |