diff options
Diffstat (limited to 'archaeological_warehouse/models.py')
| -rw-r--r-- | archaeological_warehouse/models.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index cdb2d4bd8..2a04304b2 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -32,7 +32,7 @@ from django.urls import reverse from ishtar_common.utils import ugettext_lazy as _, pgettext_lazy from django.apps import apps -from ishtar_common.data_importer import post_importer_action, pre_importer_action +from ishtar_common.data_importer import post_importer_action, pre_importer_action, ImporterError from ishtar_common.model_managers import ExternalIdManager, UUIDModelManager from ishtar_common.models import ValueGetter, get_current_profile, HistoryModel from ishtar_common.models_common import ( @@ -61,7 +61,6 @@ from ishtar_common.utils import ( cached_label_and_geo_changed, get_generated_id, ) -from ishtar_common.data_importer import ImporterError class DivisionContainer(DashboardFormItem): @@ -298,9 +297,11 @@ class Warehouse( SearchVectorConfig("warehouse_type__label"), SearchVectorConfig("external_id"), SearchVectorConfig("town"), - SearchVectorConfig("precise_town__name"), SearchVectorConfig("comment", "local"), ] + PROPERTY_SEARCH_VECTORS = [ + SearchVectorConfig("precise_town_name"), + ] EXTRA_REQUEST_KEYS = { "warehouse_type__label": "warehouse_type__label", @@ -583,7 +584,7 @@ class Warehouse( for k in Address.FIELDS: if k == "alt_address_is_prefered": setattr(self, k, False) - elif k in ("precise_town", "email"): + elif k in ("precise_town_id", "email"): setattr(self, k, None) else: setattr(self, k, "") @@ -1211,11 +1212,11 @@ class Container( town_id = None q_geotown = GeoVectorData.objects.filter(pk=None) else: - town_id = self.location.precise_town.pk + town_id = self.location.precise_town_id q_geotown = GeoVectorData.objects.filter( source_content_type__model="town", source_content_type__app_label="ishtar_common", - source_id=self.location.precise_town.pk, + source_id=self.location.precise_town_id, multi_polygon__isnull=False) q_geodata_town = self.geodata.filter( source_content_type__model="town", |