From f60d22247606b536227f9dc9a3d58d2a2919665d Mon Sep 17 00:00:00 2001 From: mahesh Date: Thu, 21 Apr 2016 17:23:38 +0530 Subject: added login_required decorator --- tbc_error_page/views.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tbc_error_page/views.py') diff --git a/tbc_error_page/views.py b/tbc_error_page/views.py index 099f996..3d87454 100644 --- a/tbc_error_page/views.py +++ b/tbc_error_page/views.py @@ -1,14 +1,12 @@ 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.contrib.auth.decorators import login_required from django.template import RequestContext 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) curr_user = request.user @@ -38,7 +36,7 @@ def error(request): 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) curr_user = request.user -- cgit From 1d6eede612130ae0bb6ea4fa03f60fc71ecbbe3d Mon Sep 17 00:00:00 2001 From: mahesh Date: Thu, 21 Apr 2016 18:34:46 +0530 Subject: changes in context --- tbc_error_page/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tbc_error_page/views.py') diff --git a/tbc_error_page/views.py b/tbc_error_page/views.py index 3d87454..6dd5206 100644 --- a/tbc_error_page/views.py +++ b/tbc_error_page/views.py @@ -28,12 +28,12 @@ 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, "deliberate" :deliberate_urls_list} return render_to_response ("deliberate.html", context, ci) - context = {"context": error_details, "user": curr_user} + context = {"context": error_details, "reviewer": curr_user} return render_to_response ("error.html", context, ci) @login_required(login_url="/login/") @@ -54,7 +54,7 @@ def broken(request): db_instance.update_broken_data(broken_json_data) broken = Broken.objects.all() - context = {"broken": broken, "user": curr_user} + context = {"broken": broken, "reviewer": curr_user} return render_to_response("broken.html", context, ci) -- cgit From a1018449fb6e6d584a8b86f07c6642ce852c4a19 Mon Sep 17 00:00:00 2001 From: mahesh Date: Tue, 26 Apr 2016 15:30:21 +0530 Subject: removed request context --- tbc_error_page/views.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'tbc_error_page/views.py') diff --git a/tbc_error_page/views.py b/tbc_error_page/views.py index 6dd5206..d788afa 100644 --- a/tbc_error_page/views.py +++ b/tbc_error_page/views.py @@ -1,14 +1,15 @@ from django.shortcuts import render_to_response from .models import Error, Broken, get_json_from_file from django.contrib.auth.decorators import login_required -from django.template import RequestContext +from django.core.context_processors import csrf from django.http import Http404 from tbc.views import is_reviewer @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") @@ -28,17 +29,19 @@ def error(request): deliberate_urls_list = request.POST.getlist("deliberate") db_instance.update_deliberate_error(deliberate_urls_list) - context = {"reviewer":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, "reviewer": curr_user} - return render_to_response ("error.html", context, ci) + context["context"] = error_details + context[ "reviewer"] = curr_user + return render_to_response ("error.html", context) @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") @@ -54,7 +57,8 @@ def broken(request): db_instance.update_broken_data(broken_json_data) broken = Broken.objects.all() - context = {"broken": broken, "reviewer": curr_user} - return render_to_response("broken.html", context, ci) + context["broken"] = broken + context[ "reviewer"] = curr_user + return render_to_response("broken.html", context) -- cgit