From 95363ba7336ea9ced21fb942eef4a8ba0469c4ae Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Fri, 13 May 2022 14:54:09 +0300 Subject: [PATCH 1/2] Fix: Tweak the horrible code in SearchableField so another corner case works Fixes #3940. Hopefully doesn't break anything. --- ietf/utils/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py index 68d6914d3ef..ad040c10cd1 100644 --- a/ietf/utils/fields.py +++ b/ietf/utils/fields.py @@ -264,7 +264,7 @@ def prepare_value(self, value): value = value[0] else: if not isinstance(value[0], self.model): - qs = self.get_model_instances(value[0]) + qs = self.get_model_instances(value) for val in value[1:]: qs = qs.union(self.get_model_instances(val)) value = qs @@ -343,4 +343,4 @@ def update_dimension_fields(self, *args, **kwargs): try: super().update_dimension_fields(*args, **kwargs) except FileNotFoundError: - pass # don't do anything if the file has gone missing \ No newline at end of file + pass # don't do anything if the file has gone missing From 12c9580e2710c6655cca3213902346aff2477675 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 13 May 2022 16:08:42 -0500 Subject: [PATCH 2/2] fix: remove incorrect remaining loop. --- ietf/utils/fields.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py index ad040c10cd1..bb36ce1c0c4 100644 --- a/ietf/utils/fields.py +++ b/ietf/utils/fields.py @@ -264,10 +264,7 @@ def prepare_value(self, value): value = value[0] else: if not isinstance(value[0], self.model): - qs = self.get_model_instances(value) - for val in value[1:]: - qs = qs.union(self.get_model_instances(val)) - value = qs + value = self.get_model_instances(value) if isinstance(value, int): value = str(value) if isinstance(value, str):