From 1ebd295082bb0e6b230cf3bc39fd04bee71c2bd7 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Sat, 29 Apr 2017 19:00:21 -0400
Subject: Fixed #28040 -- Updated SplitArrayWidget to use template-based widget
 rendering.

Thanks Preston Timmons for review.
---
 django/contrib/postgres/forms/array.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'django/contrib/postgres/forms/array.py')

diff --git a/django/contrib/postgres/forms/array.py b/django/contrib/postgres/forms/array.py
index 303b46dfb2..97e4346f60 100644
--- a/django/contrib/postgres/forms/array.py
+++ b/django/contrib/postgres/forms/array.py
@@ -6,7 +6,6 @@ from django.contrib.postgres.validators import (
     ArrayMaxLengthValidator, ArrayMinLengthValidator,
 )
 from django.core.exceptions import ValidationError
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 
 from ..utils import prefix_validation_error
@@ -90,6 +89,7 @@ class SimpleArrayField(forms.CharField):
 
 
 class SplitArrayWidget(forms.Widget):
+    template_name = 'postgres/widgets/split_array.html'
 
     def __init__(self, widget, size, **kwargs):
         self.widget = widget() if isinstance(widget, type) else widget
@@ -116,11 +116,13 @@ class SplitArrayWidget(forms.Widget):
             id_ += '_0'
         return id_
 
-    def render(self, name, value, attrs=None, renderer=None):
+    def get_context(self, name, value, attrs=None):
+        attrs = {} if attrs is None else attrs
+        context = super().get_context(name, value, attrs)
         if self.is_localized:
             self.widget.is_localized = self.is_localized
         value = value or []
-        output = []
+        context['widget']['subwidgets'] = []
         final_attrs = self.build_attrs(attrs)
         id_ = final_attrs.get('id')
         for i in range(max(len(value), self.size)):
@@ -130,11 +132,10 @@ class SplitArrayWidget(forms.Widget):
                 widget_value = None
             if id_:
                 final_attrs = dict(final_attrs, id='%s_%s' % (id_, i))
-            output.append(self.widget.render(name + '_%s' % i, widget_value, final_attrs, renderer))
-        return mark_safe(self.format_output(output))
-
-    def format_output(self, rendered_widgets):
-        return ''.join(rendered_widgets)
+            context['widget']['subwidgets'].append(
+                self.widget.get_context(name + '_%s' % i, widget_value, final_attrs)['widget']
+            )
+        return context
 
     @property
     def media(self):
-- 
cgit v1.3