Navigation

sites.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

r5918	r6776
3	3	from django.contrib.databrowse.datastructures import EasyModel, EasyChoice
4	4	from django.shortcuts import render_to_response
	5	from django.utils.safestring import mark_safe
5	6
6	7	class AlreadyRegistered(Exception):
…	…
61	62	def main_view(self, request):
62	63	easy_model = EasyModel(self.site, self.model)
63		html_snippets = ~~u'\n'.join([p.model_index_html(request, self.model, self.site) for p in self.plugins.values()]~~)
	64	html_snippets = mark_safe(u'\n'.join([p.model_index_html(request, self.model, self.site) for p in self.plugins.values()]))
64	65	return render_to_response('databrowse/model_detail.html', {
65	66	'model': easy_model,