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', '')