From f96a3a91359d4f86fb54fb20b19c35f4281b475e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 16 Oct 2018 15:34:00 +0200 Subject: Disable site naturalk key (circular dependency problem with operations) --- archaeological_finds/models_finds.py | 6 ++---- archaeological_finds/models_treatments.py | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'archaeological_finds') diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 539ba2325..1ef9d5846 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -38,14 +38,12 @@ from ishtar_common.alternative_configs import ALTERNATE_CONFIGS from ishtar_common.models import Document, GeneralType, \ HierarchicalType, BaseHistorizedItem, ShortMenuItem, LightHistorizedItem, \ HistoricalRecords, OwnPerms, Person, Basket, post_save_cache, \ - ValueGetter, get_current_profile, IshtarSiteProfile + ValueGetter, get_current_profile, IshtarSiteProfile, PRIVATE_FIELDS, \ + SpatialReferenceSystem, BulkUpdatedItem, ExternalIdManager from archaeological_operations.models import AdministrativeAct, Operation from archaeological_context_records.models import ContextRecord, Dating -from ishtar_common.models import PRIVATE_FIELDS, SpatialReferenceSystem, \ - BulkUpdatedItem, ExternalIdManager - class MaterialType(HierarchicalType): code = models.CharField(_(u"Code"), max_length=10, blank=True, null=True) diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index 93a45164b..6a57a77f5 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -27,14 +27,13 @@ from django.template.defaultfilters import slugify from django.utils.translation import ugettext_lazy as _, pgettext_lazy, \ activate, deactivate -from ishtar_common.models import ExternalIdManager from archaeological_finds.models_finds import Find, FindBasket, TreatmentType from archaeological_operations.models import ClosedItem, Operation from archaeological_warehouse.models import Warehouse, Container from ishtar_common.models import Document, GeneralType, \ ImageModel, BaseHistorizedItem, OwnPerms, HistoricalRecords, Person, \ Organization, ValueGetter, post_save_cache, ShortMenuItem, \ - DashboardFormItem + DashboardFormItem, ExternalIdManager from ishtar_common.utils import cached_label_changed, get_current_year -- cgit v1.2.3