From c153cee678fd2bc1901e7b2216b301aedb00728d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 8 Jan 2021 11:25:18 +0100 Subject: Jinja filter: lowerfirst - fix grammatical_gender export in templates --- ishtar_common/models.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6ac197af4..98546c727 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1755,6 +1755,17 @@ class GenderedType(GeneralType): doc += ' "{}": {}'.format(key, label) return doc + def get_values(self, prefix='', **kwargs): + dct = { + prefix: self.label, + prefix + "id": self.pk, + prefix + "txt_idx": self.txt_idx, + prefix + "grammatical_gender": self.grammatical_gender + } + if prefix: + dct[prefix[:-1]] = self.label + return dct + class OrganizationType(GenderedType): class Meta: @@ -1983,14 +1994,8 @@ class TitleType(GenderedType): return doc def get_values(self, prefix='', **kwargs): - dct = { - prefix: self.label, - prefix + "id": self.pk, - prefix + "txt_idx": self.txt_idx, - prefix + "long_title": self.long_title - } - if prefix: - dct[prefix[:-1]] = self.label + dct = super(TitleType, self).get_values(prefix=prefix, **kwargs) + dct[prefix + "long_title"] = self.long_title return dct -- cgit v1.2.3