summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-08-01 20:00:30 +0000
committerBrian Rosner <brosner@gmail.com>2008-08-01 20:00:30 +0000
commit4c0234215ec38f9fb7ce95cdc49d89cf10a87b50 (patch)
tree69001e3076f720e33267067a234f315e7bc45ab1
parent2904c1d4b33fb4612291db9d46fff56842854e58 (diff)
Fixed #5631 -- When fieldsets contains a field that is on the same line, it is now collapsable when collapse is set in classes. Thanks andybak for some research and Karen Tracey for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admin/options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index c6b33e938b..5243e3cdce 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -89,7 +89,7 @@ class Fieldline(object):
yield AdminField(self.form, field, is_first=(i == 0))
def errors(self):
- return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]))
+ return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields]).strip('\n'))
class AdminField(object):
def __init__(self, form, field, is_first):