diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-15 14:12:51 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-15 14:12:51 +0200 |
| commit | 2b07ee826ae9cdcf1d7aec4fc882eb5fa9a3d41d (patch) | |
| tree | 2f1d2050b699b949c0769c5a6ddb286de69c80f6 /ishtar_common | |
| parent | 23906ee248e5a6a9e4a697239038ae213847be02 (diff) | |
| download | Ishtar-2b07ee826ae9cdcf1d7aec4fc882eb5fa9a3d41d.tar.bz2 Ishtar-2b07ee826ae9cdcf1d7aec4fc882eb5fa9a3d41d.zip | |
Fix tests
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/tests.py | 7 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index c2abab10c..8de8fda6e 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -1457,6 +1457,13 @@ class IshtarBasicTest(TestCase): town.year = 2050 town.save() town = models.Town.objects.get(numero_insee="99999") + self.assertEqual(town.cached_label, "Sin City - 99") + + models.Town.objects.create(name="Mega City", numero_insee="99999", + year=2051) + mega_city = models.Town.objects.get(numero_insee="99999", year=2051) + town.children.add(mega_city) + town = models.Town.objects.get(numero_insee="99999-2050") self.assertEqual(town.cached_label, "Sin City - 99 (2050)") diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index b53beab90..211cb7897 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -568,7 +568,9 @@ def _manage_hierarchic_fields(dct, and_reqs): suffix = 'cached_label__iexact' else: continue - val = _clean_type_val(dct.pop(req)) + val = _clean_type_val(dct.pop(req)).strip('"') + if val.startswith('"') and val.endswith('"'): + val = val[1:-1] reqs = Q(**{req: val}) base_req = req[:] for idx in range(HIERARCHIC_LEVELS): |