From 3234cb0f04174536b19ed4c2d88b28f2ae77fd60 Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Fri, 21 Jul 2017 17:10:39 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=20=D1=82=D0=B5=D0=BC=20?= =?UTF-8?q?+=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D1=80?= =?UTF-8?q?=D0=BE=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- management/api.py | 6 ++++-- management/views.py | 11 ++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/management/api.py b/management/api.py index 1a5cf55..f656f13 100755 --- a/management/api.py +++ b/management/api.py @@ -209,7 +209,8 @@ def open_lessons(request, context): course = Course.objects.get(id=request.GET['course']) checkbox = True if request.GET.get('homes') == 'on' else False themes = request.GET['themes'].split(' ') - themes.remove('') + if '' in themes: + themes.remove('') for t in themes: t = int(t) @@ -246,7 +247,8 @@ def open_homes(request, context): user = User.objects.get(id=request.GET['user']) course = Course.objects.get(id=request.GET['course']) themes = request.GET['themes'].split(' ') - themes.remove('') + if '' in themes: + themes.remove('') for t in themes: t = int(t) diff --git a/management/views.py b/management/views.py index 5afab30..46fcc67 100755 --- a/management/views.py +++ b/management/views.py @@ -11,6 +11,7 @@ from courses.models import Course, CourseTheme from management.reports import get_now_success_hw, get_second_success_hw from access.models import User from finance.models import Bill, Price +from .forms import UploadFileForm @response_decor(template='super_bill.html') def super_bill(request): @@ -134,10 +135,13 @@ def progress_report(request): @response_decor(template='cabinet.html') def render_management_cabinet(request): - return {} + if request.user.in_role != 'A': + raise Http404 + else: + return {} + -from .forms import UploadFileForm @response_decor(template='diplomscab.html') def render_diplom_cabinet(request): @@ -145,7 +149,6 @@ def render_diplom_cabinet(request): if request.method == 'POST': form = UploadFileForm(request.POST, request.FILES) - print(form) for l in request.FILES['file'].readlines(): try: user = User.objects.get(email=l.rstrip().lower()) @@ -163,12 +166,10 @@ def render_diplom_cabinet(request): context['form'] = form - print(context) return context else: form = UploadFileForm() context['form'] = form - print(context) return context