From 747dd0883f44850c66972942df8e629ebc0b0187 Mon Sep 17 00:00:00 2001 From: Mikhail Bortnikov Date: Mon, 10 Jul 2017 15:37:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=20=D0=BF=D1=80=D0=BE=D1=88=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=83=D1=80=D0=BE=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- courses/views.py | 6 +++--- journals/models.py | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/courses/views.py b/courses/views.py index d89d44e..0d65036 100755 --- a/courses/views.py +++ b/courses/views.py @@ -45,9 +45,9 @@ def course(request, slug): if created: check_journal(journal) _map = CourseMap.objects.filter(course=course).order_by('sort').first() - #_j = _map.get_obj() - #j = HomeworkJ.objects.get(material=_j, student=request.user) - #j.open_material() + _j = _map.get_obj() + j = HomeworkJ.objects.get(material=_j, student=request.user) + j.open_material() else: journal, created = TeacherJ.objects.get_or_create(course=course, student=user_fabric(request.user)) diff --git a/journals/models.py b/journals/models.py index 5666f53..152c1c9 100755 --- a/journals/models.py +++ b/journals/models.py @@ -591,9 +591,7 @@ class LessonJ(models.Model): if _type == 'L': obj = LessonJ elif _type == 'H': - _before = CourseMap.objects.get(token=_before.token) - _type, _before = _before.get_lesson_before() - obj = LessonJ + obj = HomeworkJ elif _type == 'E': obj = ExamJ