From f204c0b224451b977e1e0558dfd17e3a701d9c3d Mon Sep 17 00:00:00 2001 From: Tobias Bengfort Date: Wed, 12 Jan 2022 14:29:53 +0100 Subject: [PATCH] fix empty attribute options on unsupported language (again) Fixup 82719aa15464f4205105296bb569c63ddf049eb5 The previous version included the fallback translation even a matching translation is available. This new version works correctly in all of these cases: - use fallback_lang if lang is not available - use lang if lang is available - use fallback_lang if lang == fallback_lang --- castellum/recruitment/attribute_fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/castellum/recruitment/attribute_fields.py b/castellum/recruitment/attribute_fields.py index 83f51c60f..e4342189c 100644 --- a/castellum/recruitment/attribute_fields.py +++ b/castellum/recruitment/attribute_fields.py @@ -173,8 +173,8 @@ class TextAttributeField(BaseAttributeField): class BaseChoiceAttributeField(BaseAttributeField): def get_choices(self): - qs = self.description.attributechoice_set.active_translations() - return list(qs.values_list('pk', 'translations__label')) + qs = self.description.attributechoice_set.all() + return [(c.pk, c.label) for c in qs] def formfield(self, form_class=None, **kwargs): return super().formfield(form_class=form_class, choices=self.get_choices(), **kwargs) -- GitLab