Context record towns: change column and search to point directly (not through parcel)

6 files changed, 18 insertions, 18 deletions

diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py
index 17e557283..0d68d6aa3 100644
--- a/archaeological_context_records/forms.py
+++ b/archaeological_context_records/forms.py
@@ -63,7 +63,7 @@ class RecordSelect(TableSelect):
     search_vector = forms.CharField(label=_(u"Full text search"),
                                     widget=widgets.SearchWidget)
     label = forms.CharField(label=_(u"ID"), max_length=100)
-    parcel__town = get_town_field()
+    town = get_town_field()
     if settings.COUNTRY == 'fr':
         operation__code_patriarche = forms.CharField(
             max_length=500,
@@ -406,8 +406,8 @@ class RecordSourceSelect(SourceSelect):
             max_length=500,
             widget=OAWidget,
             label="Code PATRIARCHE")
-    context_record__parcel__town = get_town_field(
-        label=_(u"Town of the operation"))
+    context_record__town = get_town_field(
+        label=_(u"Town"))
     context_record__datings__period = forms.ChoiceField(
         label=_(u"Period of the context record"), choices=[])
     context_record__unit = forms.ChoiceField(
diff --git a/archaeological_context_records/lookups.py b/archaeological_context_records/lookups.py
index 3d7b16d4a..8356f5e12 100644
--- a/archaeological_context_records/lookups.py
+++ b/archaeological_context_records/lookups.py
@@ -16,7 +16,7 @@ class ContextRecordLookup(LookupChannel):
         for term in q.strip().split(' '):
             subquery = (
                 Q(cached_label__icontains=term) |
-                Q(parcel__town__name__icontains=term)
+                Q(town__name__icontains=term)
             )
             query &= subquery
         return self.model.objects.filter(query).order_by('cached_label')[:20]
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 08c6f1d93..db65389f0 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -211,7 +211,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
     SLUG = 'contextrecord'
     EXTERNAL_ID_KEY = 'context_record_external_id'
     EXTERNAL_ID_DEPENDENCIES = ['base_finds']
-    TABLE_COLS = ['label', 'operation__common_name', 'parcel__town__name',
+    TABLE_COLS = ['label', 'operation__common_name', 'town__name',
                   'parcel__short_label', 'unit']
     if settings.COUNTRY == 'fr':
         TABLE_COLS.insert(1, 'operation__code_patriarche')
@@ -224,8 +224,8 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
         'operation__code_patriarche': _(u"Operation (Patriarche code)"),
         'operation__common_name': _(u"Operation (name)"),
         'parcel__external_id': _(u"Parcel (external ID)"),
-        'parcel__town__name': _(u"Parcel (town)"),
-        'parcel__town': _(u"Parcel (town)"),
+        'town__name': _(u"Town"),
+        'town': _(u"Town"),
         'parcel__year': _(u"Parcel (year)"),
         'section__parcel_number': _(u"Parcel"),
     }
@@ -237,7 +237,7 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem,
 
     # search parameters
     EXTRA_REQUEST_KEYS = {
-        'parcel__town': 'parcel__town__pk',
+        'town': 'town__pk',
         'parcel__short_label': 'parcel__short_label',
         'operation__year': 'operation__year__contains',
         'year': 'operation__year__contains',
@@ -697,7 +697,7 @@ class ContextRecordSource(Source):
         'comment': 'comment__icontains',
         'person': 'authors__person__pk',
         'additional_information': 'additional_information__icontains',
-        'context_record__parcel__town': 'context_record__parcel__town__pk',
+        'context_record__town': 'context_record__town__pk',
         'context_record__operation__year': 'context_record__operation__year',
         'context_record__operation__operation_code':
         'context_record__operation__operation_code',
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 8f7626656..edf5ee266 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -439,19 +439,19 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase):
         base_town.children.add(child_town)
 
         # simple search
-        search = {'parcel__town': base_town.pk}
+        search = {'town': base_town.pk}
         response = c.get(reverse('get-contextrecord'), search)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(json.loads(response.content)['recordsTotal'], 1)
 
         # parent search
-        search = {'parcel__town': parent_town.pk}
+        search = {'town': parent_town.pk}
         response = c.get(reverse('get-contextrecord'), search)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(json.loads(response.content)['recordsTotal'], 1)
 
         # child search
-        search = {'parcel__town': child_town.pk}
+        search = {'town': child_town.pk}
         response = c.get(reverse('get-contextrecord'), search)
         self.assertEqual(response.status_code, 200)
         self.assertEqual(json.loads(response.content)['recordsTotal'], 1)
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index a01bd45a6..6107b744e 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -432,7 +432,7 @@ class FindSelect(TableSelect):
     base_finds__cache_short_id = forms.CharField(label=_(u"Short ID"))
     base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID"))
     label = forms.CharField(label=_(u"Free ID"))
-    base_finds__context_record__parcel__town = get_town_field()
+    base_finds__context_record__town = get_town_field()
     base_finds__context_record__operation__year = forms.IntegerField(
         label=_(u"Year"))
     base_finds__context_record__operation__operation_code = forms.IntegerField(
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 9b0f085c7..dadda2003 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -587,7 +587,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
     SHOW_URL = 'show-find'
     SLUG = 'find'
     TABLE_COLS = ['external_id', 'label',
-                  'base_finds__context_record__parcel__town__name',
+                  'base_finds__context_record__town__name',
                   'base_finds__context_record__operation__common_name',
                   'base_finds__context_record__label',
                   'material_types__label', 'object_types__label',
@@ -604,7 +604,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
         'container__cached_label',
         'container__cahed_location',
         'description',
-        'base_finds__context_record__parcel__town__name',
+        'base_finds__context_record__town__name',
         'base_finds__context_record__parcel', ]
     COL_LABELS = {
         'base_finds__context_record__label': _(u"Context record"),
@@ -613,7 +613,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
         'base_finds__context_record__operation__code_patriarche': _(
             u"Operation (code)"
         ),
-        'base_finds__context_record__parcel__town__name': _(u"Town"),
+        'base_finds__context_record__town__name': _(u"Town"),
         'base_finds__context_record__operation__common_name': _(
             u"Operation (name)"
         ),
@@ -670,8 +670,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms,
             'base_finds__context_record__pk',
         'base_finds__context_record__archaeological_site':
             'base_finds__context_record__archaeological_site__pk',
-        'base_finds__context_record__parcel__town':
-            'base_finds__context_record__parcel__town__pk',
+        'base_finds__context_record__town':
+            'base_finds__context_record__town__pk',
         'base_finds__context_record__operation__year':
             'base_finds__context_record__operation__year__contains',
         'base_finds__context_record__operation':