From e2968fd60f28a97845673fafa4ae460583dfb0ef Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 29 Aug 2017 12:25:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BA=D0=B8=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D1=83?= =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=20?= =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B0=D0=BD=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D1=85=20=D1=87=D0=B0=D1=81=D1=82=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- analytics/urls.py | 6 +++--- analytics/views.py | 16 ---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/analytics/urls.py b/analytics/urls.py index de29679..cac8c8c 100644 --- a/analytics/urls.py +++ b/analytics/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import url -from .views import index_view, new_view +from analytics import views urlpatterns = [ - url(r'^$', index_view), - url(r'^new/$', new_view), + url(r'^$', views.index_view), + url(r'^new/$', views.new_view), ] \ No newline at end of file diff --git a/analytics/views.py b/analytics/views.py index 99ecfbb..fddc766 100644 --- a/analytics/views.py +++ b/analytics/views.py @@ -1,23 +1,14 @@ from django.shortcuts import render_to_response, redirect import time, os, csv from datetime import date -from django.http import HttpResponseForbidden from lms.settings import MEDIA_ROOT -from django.contrib.auth import get_user_model from courses.models import Course, CourseTheme from journals.models import CourseThemeJ def index_view(request): - if not request.user.is_authenticated(): - return HttpResponseForbidden() - - if not ( - request.user.in_role == "M" or request.user.in_role == "S" or request.user.in_role == "A" or request.user.is_admin): - return HttpResponseForbidden() - start = request.GET.get('start', '') end = request.GET.get('end', '') @@ -53,13 +44,6 @@ def index_view(request): def new_view(request): - if not request.user.is_authenticated(): - return HttpResponseForbidden() - - if not ( - request.user.in_role == "M" or request.user.in_role == "S" or request.user.in_role == "A" or request.user.is_admin): - return HttpResponseForbidden() - start = request.GET.get('start', '') end = request.GET.get('end', '')