Navigation

filterspecs.py

Timestamp:

11/29/07 23:50:44 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Merged trunk revision [6671].

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6670 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6655,6658-6671

r6216	r6776
10	10	from django.utils.encoding import smart_unicode, iri_to_uri
11	11	from django.utils.translation import ugettext as _
	12	from django.utils.html import escape
	13	from django.utils.safestring import mark_safe
12	14	import datetime
13	15
…	…
40	42	t = []
41	43	if self.has_output():
42		t.append(_(u'<h3>By %s:</h3>\n<ul>\n') % ~~self.title(~~))
	44	t.append(_(u'<h3>By %s:</h3>\n<ul>\n') % escape(self.title()))
43	45
44	46	for choice in self.choices(cl):
…	…
48	50	choice['display']))
49	51	t.append('</ul>\n\n')
50		return ~~"".join(t~~)
	52	return mark_safe("".join(t))
51	53
52	54	class RelatedFilterSpec(FilterSpec):