diff options
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index f55affc2f..86834a40d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,11 +1,18 @@ --- title: Ishtar changelog -date: 2022-05-27 +date: 2022-06-02 --- Ishtar changelog ================ +v3.1.71 - 2022-06-02 +-------------------- + +### Bug fix ### + +- Fix custom column label + v3.1.70 - 2022-05-27 -------------------- diff --git a/ishtar_common/version.py b/ishtar_common/version.py index 5f27577b5..df9e55fb4 100644 --- a/ishtar_common/version.py +++ b/ishtar_common/version.py @@ -1,5 +1,5 @@ -# 3.1.69 -VERSION = (3, 1, 69) +# 3.1.71 +VERSION = (3, 1, 71) def get_version(): diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 8f95f4521..0b5804748 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -1149,9 +1149,8 @@ class DataTable(Select2Media, forms.RadioSelect): slug = getattr(self.associated_model, "SLUG", None) if hasattr(self.associated_model, "COL_LABELS"): col_labels = self.associated_model.COL_LABELS - if slug in settings.TABLE_COLS: - col_labels.update(settings.TABLE_COLS[slug]) - + if slug in settings.COL_LABELS: + col_labels.update(settings.COL_LABELS[slug]) tb_key = (slug, self.table_cols) if tb_key in settings.TABLE_COLS: table_cols = settings.TABLE_COLS[tb_key] |