mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Removed use of deprecated template_loader from [2230] 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2233 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-02-02 15:00:34 +00:00
parent fa80e70e13
commit aae4f9701c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/comments/templatetags/comments.py
View File

@ -1,6 +1,7 @@
"Custom template tags for user comments" "Custom template tags for user comments"
from django.core import template, template_loader from django.core import template
from django.core.template import loader
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.models.comments import comments, freecomments from django.models.comments import comments, freecomments
from django.models.core import contenttypes from django.models.core import contenttypes
@ -56,14 +57,14 @@ class CommentFormNode(template.Node):
context['options'] = ','.join(options) context['options'] = ','.join(options)
if self.free: if self.free:
context['hash'] = comments.get_security_hash(context['options'], '', '', context['target']) context['hash'] = comments.get_security_hash(context['options'], '', '', context['target'])
default_form = template_loader.get_template(FREE_COMMENT_FORM) default_form = loader.get_template(FREE_COMMENT_FORM)
else: else:
context['photo_options'] = self.photo_options context['photo_options'] = self.photo_options
context['rating_options'] = normalize_newlines(base64.encodestring(self.rating_options).strip()) context['rating_options'] = normalize_newlines(base64.encodestring(self.rating_options).strip())
if self.rating_options: if self.rating_options:
context['rating_range'], context['rating_choices'] = comments.get_rating_options(self.rating_options) context['rating_range'], context['rating_choices'] = comments.get_rating_options(self.rating_options)
context['hash'] = comments.get_security_hash(context['options'], context['photo_options'], context['rating_options'], context['target']) context['hash'] = comments.get_security_hash(context['options'], context['photo_options'], context['rating_options'], context['target'])
default_form = template_loader.get_template(COMMENT_FORM) default_form = loader.get_template(COMMENT_FORM)
output = default_form.render(context) output = default_form.render(context)
context.pop() context.pop()
return output return output