diff options
Diffstat (limited to 'commentingapp')
| -rw-r--r-- | commentingapp/templates/commenting.html | 2 | ||||
| -rw-r--r-- | commentingapp/views.py | 23 |
2 files changed, 12 insertions, 13 deletions
diff --git a/commentingapp/templates/commenting.html b/commentingapp/templates/commenting.html index 3e888e6..82c19ed 100644 --- a/commentingapp/templates/commenting.html +++ b/commentingapp/templates/commenting.html @@ -4,7 +4,7 @@ {% block content %} <h3><center> TBC Commenting </center></h3> - <h5> Hi <u> <b>{{user}} </b> </u> </h5><br/> + <h5> Hi <u> <b>{{reviewer.get_full_name}} </b> </u> </h5><br/> <a href = "https://pythontbc.disqus.com" target = "blank">Go to Disqus admin Page </a> {% if not url_context %} diff --git a/commentingapp/views.py b/commentingapp/views.py index f2a0f36..66606b7 100644 --- a/commentingapp/views.py +++ b/commentingapp/views.py @@ -1,27 +1,26 @@ from django.shortcuts import render, render_to_response from django.contrib.auth.decorators import login_required -from django.template import RequestContext +from django.core.context_processors import csrf from .models import Url, Comments -from django.contrib.auth.decorators import user_passes_test from django.db.models import Q -from django.contrib.auth.models import User from collections import Counter -import os.path -from email.mime.text import MIMEText from django.http import Http404 from tbc.models import Book, Chapters from tbc.views import is_reviewer -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login/") + +@login_required(login_url="/login/") def commenting(request): - ci = RequestContext(request) + context = {} + context.update(csrf(request)) curr_user = request.user if not is_reviewer(curr_user): raise Http404("You are not allowed to view this page") else: url_instance = Url.objects.filter(Q(comments__is_notified = 0)).distinct() - context = {"url_context": url_instance, "user": curr_user} + context["url_context"] = url_instance + context["reviewer"] = curr_user if request.method == "POST": notified_comment_list = request.POST.getlist("comment") @@ -37,10 +36,10 @@ def commenting(request): status = url_db_instance.send_mail_to_contributor(contributor_details) if status == True: - context = {"notified_comments": "You have suceesfully notified the contributors"} + context["notified_comments"] = "You have suceesfully notified the contributors" else: - context = {"notified_comments": "Mail couldnot be sent"} - return render_to_response("notified.html", context, ci) + context["notified_comments"] = "Mail could not be sent" + return render_to_response("notified.html", context) - return render_to_response ("commenting.html", context, ci) + return render_to_response ("commenting.html", context) |