diff options
| author | ankitjavalkar | 2016-04-26 15:34:43 +0530 |
|---|---|---|
| committer | ankitjavalkar | 2016-04-26 15:34:43 +0530 |
| commit | 7668df23c88c64c13f2a7473d3bd7d6167e4ea2f (patch) | |
| tree | 3a2db9691ad0e67b0e0ca41f2a4468ad1333a38d /tbc_error_page | |
| parent | 227a5d9ea190d895e788108bda77316b6b6b867a (diff) | |
| parent | a1018449fb6e6d584a8b86f07c6642ce852c4a19 (diff) | |
| download | Python-TBC-Interface-7668df23c88c64c13f2a7473d3bd7d6167e4ea2f.tar.gz Python-TBC-Interface-7668df23c88c64c13f2a7473d3bd7d6167e4ea2f.tar.bz2 Python-TBC-Interface-7668df23c88c64c13f2a7473d3bd7d6167e4ea2f.zip | |
Merge pull request #30 from maheshgudi/master
changed login and context
Diffstat (limited to 'tbc_error_page')
| -rw-r--r-- | tbc_error_page/templates/broken.html | 2 | ||||
| -rw-r--r-- | tbc_error_page/templates/error.html | 4 | ||||
| -rw-r--r-- | tbc_error_page/views.py | 32 |
3 files changed, 20 insertions, 18 deletions
diff --git a/tbc_error_page/templates/broken.html b/tbc_error_page/templates/broken.html index 841069c..9c49785 100644 --- a/tbc_error_page/templates/broken.html +++ b/tbc_error_page/templates/broken.html @@ -5,7 +5,7 @@ <center><h4> There are no new comments </h4></center> {% else %} <h3><u><center>TBC Broken Links Page </center></u></h3> - <h5> Hi <b><u> {{user}} </b><u> </h5> + <h5> Hi <b><u> {{reviewer.get_full_name}} </b><u> </h5> <a href = "{% url 'tbc_error_page.views.error' %}"> TBC Error Status Page </a> <p></p> <table border = 1> diff --git a/tbc_error_page/templates/error.html b/tbc_error_page/templates/error.html index 237c7f3..057820e 100644 --- a/tbc_error_page/templates/error.html +++ b/tbc_error_page/templates/error.html @@ -6,8 +6,8 @@ {% block content %} <body> - <h3><u><center>TBC Error Page </center></u></h3> - <h5> Hi <b><u>{{ user }} </b></u></h5> + <h3><u><center>TBC Error Page </center></u></h3> + <h5> Hi <b><u> {{reviewer.get_full_name}} </b><u> </h5> <p><a href = "{% url 'tbc_error_page.views.broken' %}"> TBC Broken Links page </a></p> {% if not context %} <center><h4> There are no new errors </h4></center> diff --git a/tbc_error_page/views.py b/tbc_error_page/views.py index 099f996..d788afa 100644 --- a/tbc_error_page/views.py +++ b/tbc_error_page/views.py @@ -1,16 +1,15 @@ from django.shortcuts import render_to_response from .models import Error, Broken, get_json_from_file -from django.contrib.auth.decorators import user_passes_test -from django.template import RequestContext +from django.contrib.auth.decorators import login_required +from django.core.context_processors import csrf from django.http import Http404 -import json -import os from tbc.views import is_reviewer -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login") +@login_required(login_url="/login/") def error(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") @@ -30,17 +29,19 @@ def error(request): deliberate_urls_list = request.POST.getlist("deliberate") db_instance.update_deliberate_error(deliberate_urls_list) - context = {"user":request.user, "deliberate" :deliberate_urls_list} + context["reviewer"] = request.user + context["deliberate"] = deliberate_urls_list - return render_to_response ("deliberate.html", context, ci) + return render_to_response ("deliberate.html", context) + context["context"] = error_details + context[ "reviewer"] = curr_user + return render_to_response ("error.html", context) - context = {"context": error_details, "user": curr_user} - return render_to_response ("error.html", context, ci) - -@user_passes_test(lambda u:u.is_superuser, login_url="/admin/login") +@login_required(login_url="/login/") def broken(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") @@ -56,7 +57,8 @@ def broken(request): db_instance.update_broken_data(broken_json_data) broken = Broken.objects.all() - context = {"broken": broken, "user": curr_user} - return render_to_response("broken.html", context, ci) + context["broken"] = broken + context[ "reviewer"] = curr_user + return render_to_response("broken.html", context) |