diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/migrations/0105_auto_20201007_1215.py | 30 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 14 |
2 files changed, 37 insertions, 7 deletions
diff --git a/archaeological_warehouse/migrations/0105_auto_20201007_1215.py b/archaeological_warehouse/migrations/0105_auto_20201007_1215.py new file mode 100644 index 000000000..9d009bed1 --- /dev/null +++ b/archaeological_warehouse/migrations/0105_auto_20201007_1215.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.27 on 2020-10-07 12:15 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_warehouse', '0104_auto_20200925_1024'), + ] + + operations = [ + migrations.AddField( + model_name='container', + name='complete_identifier', + field=models.TextField(blank=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='historicalwarehouse', + name='complete_identifier', + field=models.TextField(blank=True, verbose_name='Complete identifier'), + ), + migrations.AddField( + model_name='warehouse', + name='complete_identifier', + field=models.TextField(blank=True, verbose_name='Complete identifier'), + ), + ] diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 21b6d2b7c..b18a2df5f 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -39,11 +39,11 @@ from ishtar_common.model_managers import ExternalIdManager, UUIDModelManager from ishtar_common.models_common import GeneralType, \ LightHistorizedItem, OwnPerms, Address, post_save_cache, \ DashboardFormItem, document_attached_changed, SearchAltName, \ - DynamicRequest, GeoItem, QRCodeItem, SearchVectorConfig, DocumentItem, \ - QuickAction, MainItem, Merge + DynamicRequest, GeoItem, CompleteIdentifierItem, SearchVectorConfig, \ + DocumentItem, QuickAction, MainItem, Merge from ishtar_common.model_merging import merge_model_objects from ishtar_common.utils import cached_label_changed, \ - cached_label_and_geo_changed, get_external_id + cached_label_and_geo_changed, get_generated_id class DivisionContainer(DashboardFormItem): @@ -254,7 +254,7 @@ post_save.connect(post_save_cache, sender=WarehouseType) post_delete.connect(post_save_cache, sender=WarehouseType) -class Warehouse(Address, DocumentItem, GeoItem, QRCodeItem, +class Warehouse(Address, DocumentItem, GeoItem, CompleteIdentifierItem, OwnPerms, MainItem, DivisionContainer): SLUG = 'warehouse' APP = "archaeological-warehouse" @@ -466,7 +466,7 @@ class Warehouse(Address, DocumentItem, GeoItem, QRCodeItem, self.skip_history_when_saving = True if not self.external_id or self.auto_external_id: - external_id = get_external_id('warehouse_external_id', self) + external_id = get_generated_id('warehouse_external_id', self) if external_id != self.external_id: self.auto_external_id = True self.external_id = external_id @@ -609,7 +609,7 @@ class ContainerTree(models.Model): db_table = 'containers_tree' -class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem, +class Container(DocumentItem, Merge, LightHistorizedItem, CompleteIdentifierItem, GeoItem, OwnPerms, MainItem, DivisionContainer): SLUG = 'container' APP = "archaeological-warehouse" @@ -1364,7 +1364,7 @@ class Container(DocumentItem, Merge, LightHistorizedItem, QRCodeItem, GeoItem, self.skip_history_when_saving = True if not self.external_id or self.auto_external_id: - external_id = get_external_id('container_external_id', self) + external_id = get_generated_id('container_external_id', self) if external_id != self.external_id: updated = True self.auto_external_id = True |