summaryrefslogtreecommitdiff
path: root/django/newforms
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-06-07 22:31:25 +0000
committerBrian Rosner <brosner@gmail.com>2008-06-07 22:31:25 +0000
commit65ef8d4da78c94a8b1da5ac058f1b85b942f58ae (patch)
tree326ec03723ee10d02ca2fae7d4540d5d02b39e2c /django/newforms
parent453d560a945d207013b163228de5ed9a7316a772 (diff)
newforms-admin: Fixed #7391 -- Mark the output of BaseFormSet.as_table safe. Thanks akaihola!
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/newforms')
-rw-r--r--django/newforms/formsets.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/newforms/formsets.py b/django/newforms/formsets.py
index 2daf8b29a2..b9e4a1fd02 100644
--- a/django/newforms/formsets.py
+++ b/django/newforms/formsets.py
@@ -1,5 +1,6 @@
from forms import Form
from django.utils.encoding import StrAndUnicode
+from django.utils.safestring import mark_safe
from fields import IntegerField, BooleanField
from widgets import Media, HiddenInput, TextInput
from util import ErrorList, ValidationError
@@ -258,7 +259,7 @@ class BaseFormSet(StrAndUnicode):
# probably should be. It might make sense to render each form as a
# table row with each field as a td.
forms = u' '.join([form.as_table() for form in self.forms])
- return u'\n'.join([unicode(self.management_form), forms])
+ return mark_safe(u'\n'.join([unicode(self.management_form), forms]))
# XXX: This API *will* change. Use at your own risk.
def _formset_factory(form, formset=BaseFormSet, extra=1, can_order=False, can_delete=False):