From d3f30dddcccf7cdcf0db0adcc569779789c076dc Mon Sep 17 00:00:00 2001 From: sysadmintma Date: Wed, 31 Mar 2021 08:03:59 +0000 Subject: [PATCH] last updates --- lms/djangoapps/wul_apps/dashboard/views.py | 17 ++++++++++++----- lms/djangoapps/wul_apps/urls.py | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/lms/djangoapps/wul_apps/dashboard/views.py b/lms/djangoapps/wul_apps/dashboard/views.py index 18d532863167..e2e398d8a5c9 100644 --- a/lms/djangoapps/wul_apps/dashboard/views.py +++ b/lms/djangoapps/wul_apps/dashboard/views.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from django.views.decorators.http import require_http_methods from django.contrib.auth.decorators import login_required +from django.contrib.admin.views.decorators import staff_member_required from django.views.decorators.csrf import ensure_csrf_cookie from edxmako.shortcuts import render_to_response from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers @@ -36,6 +37,7 @@ log = logging.getLogger() +@staff_member_required @require_http_methods(['GET']) def get_platform_courses(request): org_courses = {} @@ -70,7 +72,7 @@ def get_platform_courses(request): return JsonResponse(response) - +@staff_member_required @require_http_methods(["GET"]) def get_course_enrollments_count(request): count = 0 @@ -85,7 +87,7 @@ def get_course_enrollments_count(request): } return JsonResponse(response) - +@staff_member_required @require_http_methods(["GET"]) def get_course_enrollments(request, course_id): user_enrollments_profiles = {} @@ -148,7 +150,7 @@ def get_course_enrollments(request, course_id): } return JsonResponse(response) - +@staff_member_required @require_http_methods(["GET"]) def view_enrollments(request): user_enrollments_profiles = {} @@ -235,6 +237,7 @@ def view_enrollments(request): return JsonResponse(response) +@staff_member_required @login_required def wul_dashboard_view(request): context = {} @@ -260,9 +263,10 @@ def wul_dashboard_view(request): context['user_email'] = str(request.user.email) return render_to_response('wul_apps/dashboard.html', {"props": context}) - +@staff_member_required @login_required def get_student_profile(request, user_email): + log.info('test') if not wul_verify_access(request.user).has_dashboard_access(course_id=None): log.info('has not dashboard access') return HttpResponseForbidden @@ -388,6 +392,7 @@ def get_student_profile(request, user_email): return JsonResponse(context, status=200) +@staff_member_required @login_required def get_password_link(request): user_email = request.body @@ -395,6 +400,7 @@ def get_password_link(request): response ={'link':str(password_link)} return JsonResponse(response) +@staff_member_required @login_required def unlock_account(request): user_email = request.body @@ -404,6 +410,7 @@ def unlock_account(request): response={'error':'LoginFailure object doesn\'t exists'} return JsonResponse(response) +@staff_member_required @require_http_methods(["GET"]) @login_required def get_register_fields(request): @@ -425,9 +432,9 @@ def get_register_fields(request): return JsonResponse(response) +@staff_member_required @require_http_methods(["GET"]) @login_required - def generate_student_time_sheet(request, course_id, user_email): course_key = SlashSeparatedCourseKey.from_string(str(course_id)) course = get_course_by_id(course_key) diff --git a/lms/djangoapps/wul_apps/urls.py b/lms/djangoapps/wul_apps/urls.py index ba4f5c4908ea..375c90fda09b 100644 --- a/lms/djangoapps/wul_apps/urls.py +++ b/lms/djangoapps/wul_apps/urls.py @@ -1,6 +1,6 @@ """ -WUL APPS endpoint urls. +WUL APPS endpoints urls. """ from django.conf.urls import url, include @@ -18,7 +18,7 @@ url(r'^dashboard/get_platform_courses/', get_platform_courses, name='get_platform_courses'), url(r'^dashboard/view_enrollments/', view_enrollments, name='view_enrollments'), url(r'^dashboard/', wul_dashboard_view, name='wul_dashboard_view'), - url(r'^dashboard/get_student_profile/(?P[^/]*)$', get_student_profile, name='get_student_profile'), + url(r'^dashboard/get_student_profile/(?P[\w.%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4})/$', get_student_profile, name='get_student_profile'), url(r'^dashboard/get_password_link/', get_password_link, name='get_password_link'), url(r'^dashboard/unlock_account/', unlock_account, name='unlock_account'), url(r'^dashboard/get_register_fields/', get_register_fields, name='get_register_fields'),