summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2020-11-04 06:33:54 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2020-11-04 06:41:27 +0100
commita8400088480d5389345c0aa5ff691704f9764513 (patch)
tree237cf7ec687f8bd2bcfe944f888aaae091fab532
parent2988fde7eff7adc2daf8d0cb95534573b0ef5044 (diff)
downloadIshtar-a8400088480d5389345c0aa5ff691704f9764513.tar.bz2
Ishtar-a8400088480d5389345c0aa5ff691704f9764513.zip
Operation sheet: fix parcel column on context record table (refs #4984)
-rw-r--r--CHANGES.md6
-rw-r--r--archaeological_context_records/models.py2
-rw-r--r--ishtar_common/version.py4
3 files changed, 9 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4b8297abb..d1a05a35a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,11 @@
Ishtar changelog
================
+v3.0.15 - 2020-11-04
+--------------------
+
+### Bug fixes ###
+- Operation sheet: fix parcel column on context record table
+
v3.0.14 - 2020-10-05
--------------------
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 5e08ce6ae..8e69ac505 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -343,7 +343,7 @@ class ContextRecord(BulkUpdatedItem, DocumentItem, BaseHistorizedItem,
'parcel__cached_label', 'unit__label']
if settings.COUNTRY == 'fr':
TABLE_COLS.insert(1, 'operation__code_patriarche')
- TABLE_COLS_FOR_OPE = ['label', 'parcel', 'unit__label',
+ TABLE_COLS_FOR_OPE = ['label', 'parcel__cached_label', 'unit__label',
'cached_periods', 'description']
NEW_QUERY_ENGINE = True
COL_LABELS = {
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index e85e4b3f5..16f7de122 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 3.0.14
-VERSION = (3, 0, 14)
+# 3.0.15
+VERSION = (3, 0, 15)
def get_version():