summaryrefslogtreecommitdiff
path: root/django/forms/widgets.py
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2018-03-30 11:55:33 +0200
committerTim Graham <timograham@gmail.com>2018-04-02 09:17:38 -0400
commit160829d35b54a97977bf8ce5588aa19b1cfc2b43 (patch)
tree2147059cbfb715cf3c3a038081d4f2134380b454 /django/forms/widgets.py
parent327882a2456e84ed10668441b5f64f157f192093 (diff)
[2.0.x] Fixed #29273 -- Prevented initial selection of empty choice in multiple choice widgets.
Regression in b52c73008a9d67e9ddbb841872dc15cdd3d6ee01. Backport of f3b69f9757ec03057441ebbd52b7cdbfed31fb32 from master.
Diffstat (limited to 'django/forms/widgets.py')
-rw-r--r--django/forms/widgets.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 47396213d9..976487cb23 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -658,6 +658,8 @@ class ChoiceWidget(Widget):
def format_value(self, value):
"""Return selected values as a list."""
+ if value is None and self.allow_multiple_selected:
+ return []
if not isinstance(value, (tuple, list)):
value = [value]
return [str(v) if v is not None else '' for v in value]