precise_town refactoring for django app consistency

3 files changed, 13 insertions, 10 deletions

diff --git a/archaeological_warehouse/admin.py b/archaeological_warehouse/admin.py
index d2ccbb31f..8062999c0 100644
--- a/archaeological_warehouse/admin.py
+++ b/archaeological_warehouse/admin.py
@@ -39,7 +39,7 @@ class WarehouseAdmin(HistorizedObjectAdmin, MainGeoDataItem):
     readonly_fields = HistorizedObjectAdmin.readonly_fields
     autocomplete_fields = HistorizedObjectAdmin.autocomplete_fields + \
                           MainGeoDataItem.autocomplete_fields + [
-        "precise_town",
+        #"precise_town",
         "person_in_charge",
         "organization"
     ]
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py
index a95289669..acb2a2e50 100644
--- a/archaeological_warehouse/forms.py
+++ b/archaeological_warehouse/forms.py
@@ -188,7 +188,7 @@ class WarehouseFormMultiSelection(LockForm, MultiSearchForm):
     )
 
 
-class WarehouseForm(CustomForm, ManageOldType, forms.Form):
+class WarehouseForm(CustomForm, ManageOldType):
     HEADERS = {}
     form_label = _("Warehouse")
     form_admin_name = _("Warehouse - 010 - General")
@@ -197,9 +197,11 @@ class WarehouseForm(CustomForm, ManageOldType, forms.Form):
         "warehouse_type": models.WarehouseType,
         "person_in_charge": Person,
         "organization": Organization,
-        "precise_town": Town,
         "spatial_reference_system": SpatialReferenceSystem,
     }
+    format_models = {
+        "precise_town_id": Town,
+    }
 
     name = forms.CharField(label=_("Name"), max_length=200, validators=[name_validator])
     slug = forms.CharField(label=_("Textual ID"), max_length=200,
@@ -244,7 +246,7 @@ class WarehouseForm(CustomForm, ManageOldType, forms.Form):
     )
     postal_code = forms.CharField(label=_("Postal code"), max_length=10, required=False)
     town = forms.CharField(label=_("Town (freeform)"), max_length=150, required=False)
-    precise_town = get_town_field(required=False)
+    precise_town_id = get_town_field(required=False)
     country = forms.CharField(label=_("Country"), max_length=30, required=False)
     phone = forms.CharField(label=_("Phone"), max_length=18, required=False)
     mobile_phone = forms.CharField(
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",