Django

Code

Changeset 661

Show
Ignore:
Timestamp:
09/22/05 00:32:47 (3 years ago)
Author:
adrian
Message:

Converted django.contrib.comments.views.* to use load_and_render

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/comments/views/comments.py

    r580 r661  
    1 from django.core import formfields, template_loader, validators 
     1from django.core import formfields, validators 
    22from django.core.mail import mail_admins, mail_managers 
    33from django.core.exceptions import Http404, ObjectDoesNotExist 
    4 from django.core.extensions import DjangoContext as Context 
     4from django.core.extensions import DjangoContext, load_and_render 
    55from django.models.auth import users 
    66from django.models.comments import comments, freecomments 
    77from django.models.core import contenttypes 
    88from django.parts.auth.formfields import AuthenticationForm 
    9 from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect 
     9from django.utils.httpwrappers import HttpResponseRedirect 
    1010from django.utils.text import normalize_newlines 
    1111from django.conf.settings import BANNED_IPS, COMMENTS_ALLOW_PROFANITIES, COMMENTS_SKETCHY_USERS_GROUP, COMMENTS_FIRST_FEW, SITE_ID 
    …… 
    207207    new_data['ip_address'] = request.META.get('REMOTE_ADDR') 
    208208    new_data['is_public'] = comments.IS_PUBLIC in option_list 
    209     response = HttpResponse() 
    210209    manipulator = PublicCommentManipulator(request.user, 
    211210        ratings_required=comments.RATINGS_REQUIRED in option_list, 
    …… 
    229228        comment = errors and '' or manipulator.get_comment(new_data) 
    230229        comment_form = CommentFormWrapper(manipulator, new_data, errors, rating_choices) 
    231         t = template_loader.get_template('comments/preview') 
    232         c = Context(request, { 
     230        return load_and_render('comments/preview', { 
    233231            'comment': comment, 
    234232            'comment_form': comment_form, 
    …… 
    241239            'rating_range': rating_range, 
    242240            'rating_choices': rating_choices, 
    243         }) 
     241        }, context_instance=DjangoContext(request)) 
    244242    elif request.POST.has_key('post'): 
    245243        # If the IP is banned, mail the admins, do NOT save the comment, and 
    …… 
    253251    else: 
    254252        raise Http404, "The comment form didn't provide either 'preview' or 'post'" 
    255     response.write(t.render(c)) 
    256     return response 
    257253 
    258254def post_free_comment(request): 
    …… 
    296292    new_data['ip_address'] = request.META['REMOTE_ADDR'] 
    297293    new_data['is_public'] = comments.IS_PUBLIC in option_list 
    298     response = HttpResponse() 
    299294    manipulator = PublicFreeCommentManipulator() 
    300295    errors = manipulator.get_validation_errors(new_data) 
    301296    if errors or request.POST.has_key('preview'): 
    302297        comment = errors and '' or manipulator.get_comment(new_data) 
    303         t = template_loader.get_template('comments/free_preview') 
    304         c = Context(request, { 
     298        return load_and_render('comments/free_preview', { 
    305299            'comment': comment, 
    306300            'comment_form': formfields.FormWrapper(manipulator, new_data, errors), 
    …… 
    308302            'target': target, 
    309303            'hash': security_hash, 
    310         }) 
     304        }, context_instance=DjangoContext(request)) 
    311305    elif request.POST.has_key('post'): 
    312306        # If the IP is banned, mail the admins, do NOT save the comment, and 
    …… 
    321315    else: 
    322316        raise Http404, "The comment form didn't provide either 'preview' or 'post'" 
    323     response.write(t.render(c)) 
    324     return response 
    325317 
    326318def comment_was_posted(request): 
    …… 
    341333        except ObjectDoesNotExist: 
    342334            pass 
    343     t = template_loader.get_template('comments/posted') 
    344     c = Context(request, { 
    345         'object': obj, 
    346     }) 
    347     return HttpResponse(t.render(c)) 
     335    return load_and_render('comments/posted', {'object': obj}, context_instance=DjangoContext(request)) 

  • django/trunk/django/contrib/comments/views/karma.py

    r316 r661  
    1 from django.core import template_loader 
    2 from django.core.extensions import DjangoContext as Context 
    31from django.core.exceptions import Http404 
     2from django.core.extensions import DjangoContext, load_and_render 
    43from django.models.comments import comments, karma 
    5 from django.utils.httpwrappers import HttpResponse 
    64 
    75def vote(request, comment_id, vote): 
    …… 
    2826    # Reload comment to ensure we have up to date karma count 
    2927    comment = comments.get_object(pk=comment_id) 
    30     t = template_loader.get_template('comments/karma_vote_accepted') 
    31     c = Context(request, { 
    32         'comment': comment 
    33     }) 
    34     return HttpResponse(t.render(c)) 
     28    return load_and_render('comments/karma_vote_accepted', {'comment': comment}, context_instance=DjangoContext(request)) 

  • django/trunk/django/contrib/comments/views/userflags.py

    r549 r661  
    1 from django.core import template_loader 
    2 from django.core.extensions import DjangoContext as Context 
     1from django.core.extensions import DjangoContext, load_and_render 
    32from django.core.exceptions import Http404 
    43from django.models.comments import comments, moderatordeletions, userflags 
    54from django.views.decorators.auth import login_required 
    6 from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect 
     5from django.utils.httpwrappers import HttpResponseRedirect 
    76from django.conf.settings import SITE_ID 
    87 
    …… 
    2322        userflags.flag(comment, request.user) 
    2423        return HttpResponseRedirect('%sdone/' % request.path) 
    25     t = template_loader.get_template('comments/flag_verify') 
    26     c = Context(request, { 
    27         'comment': comment, 
    28     }) 
    29     return HttpResponse(t.render(c)) 
     24    return load_and_render('comments/flag_verify', {'comment': comment}, context_instance=DjangoContext(request)) 
    3025flag = login_required(flag) 
    3126 
    …… 
    3530    except comments.CommentDoesNotExist: 
    3631        raise Http404 
    37     t = template_loader.get_template('comments/flag_done') 
    38     c = Context(request, { 
    39         'comment': comment, 
    40     }) 
    41     return HttpResponse(t.render(c)) 
     32    return load_and_render('comments/flag_done', {'comment': comment}, context_instance=DjangoContext(request)) 
    4233 
    4334def delete(request, comment_id): 
    …… 
    6455            m.save() 
    6556        return HttpResponseRedirect('%sdone/' % request.path) 
    66     t = template_loader.get_template('comments/delete_verify') 
    67     c = Context(request, { 
    68         'comment': comment, 
    69     }) 
    70     return HttpResponse(t.render(c)) 
     57    return load_and_render('comments/delete_verify', {'comment': comment}, context_instance=DjangoContext(request)) 
    7158delete = login_required(delete) 
    7259 
    …… 
    7663    except comments.CommentDoesNotExist: 
    7764        raise Http404 
    78     t = template_loader.get_template('comments/delete_done') 
    79     c = Context(request, { 
    80         'comment': comment, 
    81     }) 
    82     return HttpResponse(t.render(c)) 
     65    return load_and_render('comments/delete_done', {'comment': comment}, context_instance=DjangoContext(request))