diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-12-15 23:05:58 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:22 +0100 |
| commit | 140f360ed1daf9fdb261bdae7f6f83974b99d8b5 (patch) | |
| tree | eeb57bdfe8ebfbc014e88ce718ed79c38e351aaa | |
| parent | 8a0322f9c7e1796ce59416dd667a02d05bef927e (diff) | |
| download | Ishtar-140f360ed1daf9fdb261bdae7f6f83974b99d8b5.tar.bz2 Ishtar-140f360ed1daf9fdb261bdae7f6f83974b99d8b5.zip | |
Fix hierarchic fields search
| -rw-r--r-- | archaeological_operations/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 61b815cb4..7f23399ea 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -572,8 +572,8 @@ class ArchaeologicalSite(DocumentItem, BaseHistorizedItem, CompleteIdentifierIte _("Virtual operation of site: {}") ).format(self.reference) if self.towns.count(): - name += u' - ' + ", ".join([town.name - for town in self.towns.all()]) + name += ' - ' + ", ".join( + [town.name for town in self.towns.all()]) operation = Operation.objects.create( operation_type=operation_type, common_name=name, diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 83d326ee9..32b6c77d1 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -824,6 +824,8 @@ def _manage_facet_search(model, dct, and_reqs): return general_types = model.general_types() hierarchic_fields = HIERARCHIC_FIELDS[:] + if hasattr(model, "hierarchic_fields"): + hierarchic_fields += model.hierarchic_fields() for base_k in general_types: if base_k in hierarchic_fields: # already managed continue @@ -873,7 +875,7 @@ def _manage_facet_search(model, dct, and_reqs): def _manage_hierarchic_fields(model, dct, and_reqs): hierarchic_fields = HIERARCHIC_FIELDS[:] if hasattr(model, "hierarchic_fields"): - hierarchic_fields = model.hierarchic_fields() + hierarchic_fields += model.hierarchic_fields() for reqs in dct.copy(): if type(reqs) not in (list, tuple): reqs = [reqs] |