Merge branch 'master' into master-trad

1 files changed, 27 insertions, 27 deletions

diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index aa5eacc30..6dcbbce65 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -291,41 +291,41 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
     CHECK_DICT = dict(CHECK_CHOICES)
     SHOW_URL = 'show-find'
     SLUG = 'find'
-    TABLE_COLS = ['label', 'material_types', 'datings.period',
-                  'base_finds.context_record.parcel.town',
-                  'base_finds.context_record.operation.year',
-                  'base_finds.context_record.operation.operation_code',
-                  'container.reference', 'container.location',
-                  'base_finds.batch',
-                  'base_finds.context_record.parcel.town',
-                  'base_finds.context_record.parcel', ]
+    TABLE_COLS = ['label', 'material_types', 'datings__period',
+                  'base_finds__context_record__parcel__town',
+                  'base_finds__context_record__operation__year',
+                  'base_finds__context_record__operation__operation_code',
+                  'container__reference', 'container__location',
+                  'base_finds__batch',
+                  'base_finds__context_record__parcel__town',
+                  'base_finds__context_record__parcel', ]
     if settings.COUNTRY == 'fr':
         TABLE_COLS.insert(
-            6, 'base_finds.context_record.operation.code_patriarche')
+            6, 'base_finds__context_record__operation__code_patriarche')
     TABLE_COLS_FOR_OPE = [
-        'base_finds.cache_short_id',
-        'base_finds.cache_complete_id',
+        'base_finds__cache_short_id',
+        'base_finds__cache_complete_id',
         'previous_id', 'label', 'material_types',
-        'datings.period', 'find_number', 'object_types',
+        'datings__period', 'find_number', 'object_types',
         'description',
-        'base_finds.context_record.parcel.town',
-        'base_finds.context_record.parcel', ]
+        'base_finds__context_record__parcel__town',
+        'base_finds__context_record__parcel', ]
 
     EXTRA_FULL_FIELDS = [
-        'base_finds.cache_short_id', 'base_finds.cache_complete_id',
-        'base_finds.comment', 'base_finds.description',
-        'base_finds.topographic_localisation',
-        'base_finds.special_interest',
-        'base_finds.discovery_date']
+        'base_finds__cache_short_id', 'base_finds__cache_complete_id',
+        'base_finds__comment', 'base_finds__description',
+        'base_finds__topographic_localisation',
+        'base_finds__special_interest',
+        'base_finds__discovery_date']
     EXTRA_FULL_FIELDS_LABELS = {
-        'base_finds.cache_short_id': _(u"Base find - Short ID"),
-        'base_finds.cache_complete_id': _(u"Base find - Complete ID"),
-        'base_finds.comment': _(u"Base find - Comment"),
-        'base_finds.description': _(u"Base find - Description"),
-        'base_finds.topographic_localisation': _(u"Base find - "
-                                                 u"Topographic localisation"),
-        'base_finds.special_interest': _(u"Base find - Special interest"),
-        'base_finds.discovery_date': _(u"Base find - Discovery date"),
+        'base_finds__cache_short_id': _(u"Base find - Short ID"),
+        'base_finds__cache_complete_id': _(u"Base find - Complete ID"),
+        'base_finds__comment': _(u"Base find - Comment"),
+        'base_finds__description': _(u"Base find - Description"),
+        'base_finds__topographic_localisation': _(u"Base find - "
+                                                  u"Topographic localisation"),
+        'base_finds__special_interest': _(u"Base find - Special interest"),
+        'base_finds__discovery_date': _(u"Base find - Discovery date"),
     }
     ATTRS_EQUIV = {'get_first_base_find': 'base_finds'}