поправил выбор тем + проверка роли

remotes/origin/pm_task_31703
Mikhail Bortnikov 9 years ago
parent 0d8be120ce
commit 3234cb0f04
  1. 6
      management/api.py
  2. 11
      management/views.py

@ -209,7 +209,8 @@ def open_lessons(request, context):
course = Course.objects.get(id=request.GET['course']) course = Course.objects.get(id=request.GET['course'])
checkbox = True if request.GET.get('homes') == 'on' else False checkbox = True if request.GET.get('homes') == 'on' else False
themes = request.GET['themes'].split(' ') themes = request.GET['themes'].split(' ')
themes.remove('') if '' in themes:
themes.remove('')
for t in themes: for t in themes:
t = int(t) t = int(t)
@ -246,7 +247,8 @@ def open_homes(request, context):
user = User.objects.get(id=request.GET['user']) user = User.objects.get(id=request.GET['user'])
course = Course.objects.get(id=request.GET['course']) course = Course.objects.get(id=request.GET['course'])
themes = request.GET['themes'].split(' ') themes = request.GET['themes'].split(' ')
themes.remove('') if '' in themes:
themes.remove('')
for t in themes: for t in themes:
t = int(t) t = int(t)

@ -11,6 +11,7 @@ from courses.models import Course, CourseTheme
from management.reports import get_now_success_hw, get_second_success_hw from management.reports import get_now_success_hw, get_second_success_hw
from access.models import User from access.models import User
from finance.models import Bill, Price from finance.models import Bill, Price
from .forms import UploadFileForm
@response_decor(template='super_bill.html') @response_decor(template='super_bill.html')
def super_bill(request): def super_bill(request):
@ -134,10 +135,13 @@ def progress_report(request):
@response_decor(template='cabinet.html') @response_decor(template='cabinet.html')
def render_management_cabinet(request): 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') @response_decor(template='diplomscab.html')
def render_diplom_cabinet(request): def render_diplom_cabinet(request):
@ -145,7 +149,6 @@ def render_diplom_cabinet(request):
if request.method == 'POST': if request.method == 'POST':
form = UploadFileForm(request.POST, request.FILES) form = UploadFileForm(request.POST, request.FILES)
print(form)
for l in request.FILES['file'].readlines(): for l in request.FILES['file'].readlines():
try: try:
user = User.objects.get(email=l.rstrip().lower()) user = User.objects.get(email=l.rstrip().lower())
@ -163,12 +166,10 @@ def render_diplom_cabinet(request):
context['form'] = form context['form'] = form
print(context)
return context return context
else: else:
form = UploadFileForm() form = UploadFileForm()
context['form'] = form context['form'] = form
print(context)
return context return context

Loading…
Cancel
Save