← Back to branch summary

~kkubasik/django/aggregation-branch

« back to all changes in this revision

Viewing changes to django/contrib/admin/views/template.py

  • Committer: adrian
  • Date: 2006-05-02 01:31:56 UTC
  • Revision ID: vcs-imports@canonical.com-20060502013156-2941fcd40d080649
MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/contrib/admin/views/template.py
1
1
from django.contrib.admin.views.decorators import staff_member_required
2
 
from django.core import formfields, validators
3
 
from django.core import template
4
 
from django.core.template import loader
5
 
from django.core.extensions import DjangoContext, render_to_response
6
 
from django.models.core import sites
 
2
from django.core import validators
 
3
from django import template, forms
 
4
from django.template import loader
 
5
from django.shortcuts import render_to_response
 
6
from django.contrib.sites.models import Site
7
7
from django.conf import settings
8
8
 
9
9
def template_validator(request):
23
23
        errors = manipulator.get_validation_errors(new_data)
24
24
        if not errors:
25
25
            request.user.add_message('The template is valid.')
26
 
    return render_to_response('admin/template_validator', {
 
26
    return render_to_response('admin/template_validator.html', {
27
27
        'title': 'Template validator',
28
 
        'form': formfields.FormWrapper(manipulator, new_data, errors),
29
 
    }, context_instance=DjangoContext(request))
 
28
        'form': forms.FormWrapper(manipulator, new_data, errors),
 
29
    }, context_instance=template.RequestContext(request))
30
30
template_validator = staff_member_required(template_validator)
31
31
 
32
 
class TemplateValidator(formfields.Manipulator):
 
32
class TemplateValidator(forms.Manipulator):
33
33
    def __init__(self, settings_modules):
34
34
        self.settings_modules = settings_modules
35
 
        site_list = sites.get_in_bulk(settings_modules.keys()).values()
 
35
        site_list = Site.objects.get_in_bulk(settings_modules.keys()).values()
36
36
        self.fields = (
37
 
            formfields.SelectField('site', is_required=True, choices=[(s.id, s.name) for s in site_list]),
38
 
            formfields.LargeTextField('template', is_required=True, rows=25, validator_list=[self.isValidTemplate]),
 
37
            forms.SelectField('site', is_required=True, choices=[(s.id, s.name) for s in site_list]),
 
38
            forms.LargeTextField('template', is_required=True, rows=25, validator_list=[self.isValidTemplate]),
39
39
        )
40
40
 
41
41
    def isValidTemplate(self, field_data, all_data):