From fa7832607eaa350e9f9154059b57d185dc12f441 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 29 Nov 2023 23:02:27 +0100 Subject: ✨ New accessor for find template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_finds/models_finds.py | 15 ++++++++------- ishtar_common/utils_secretary.py | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 455570523..f702c97ea 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -2169,13 +2169,14 @@ class Find( if no_base_finds: return values # by default attach first basefind data - if not filtr or prefix + "base_finds" not in filtr: - bf = self.get_first_base_find() - if not bf: - return values - v = bf.get_values(prefix=prefix, no_values=True, filtr=filtr, **kwargs) - v.update(values) - values = v + bf = self.get_first_base_find() + if not bf: + return values + alt_filtr = [k[len("base_find_"):] for k in filtr if k.startswith("base_find_")] + v = bf.get_values(prefix=prefix, no_values=True, filtr=alt_filtr, **kwargs) + v = dict([('base_find_' + k, v) for k, v in v.items()]) + v.update(values) + values = v kwargs["no_find"] = True values[prefix + "base_finds"] = [ base_find.get_values(no_values=True, filtr=filtr, **kwargs) diff --git a/ishtar_common/utils_secretary.py b/ishtar_common/utils_secretary.py index eea688ea1..d87201c6a 100644 --- a/ishtar_common/utils_secretary.py +++ b/ishtar_common/utils_secretary.py @@ -161,7 +161,7 @@ class IshtarSecretaryRenderer(Renderer): result = xml_source ### changes try: - near = result.split("\n")[e.lineno - 1][e.offset - 200 : e.offset + 200] + near = result.split("\n")[e.lineno - 1][e.offset - 500 : e.offset + 500] except IndexError: near = "..." print(result) -- cgit v1.2.3