From 6d8979f4c2fbfb9fd5db92acd72489cbbcbdd5d1 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Tue, 31 Jan 2017 06:41:51 -0800 Subject: Fixed #27758 -- Reallowed AdvancedModelIterator pattern after template widget rendering. --- django/forms/widgets.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'django/forms') diff --git a/django/forms/widgets.py b/django/forms/widgets.py index eef90a3bd4..c32653a245 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -552,8 +552,6 @@ class ChoiceWidget(Widget): for option_value, option_label in chain(self.choices): if option_value is None: option_value = '' - else: - option_value = force_text(option_value) if isinstance(option_label, (list, tuple)): index = groups[-1][2] + 1 @@ -569,7 +567,7 @@ class ChoiceWidget(Widget): for subvalue, sublabel in choices: selected = ( - subvalue in value and + force_text(subvalue) in value and (has_selected is False or self.allow_multiple_selected) ) if selected is True and has_selected is False: -- cgit v1.3