MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: batch context

Browse Source
This commit is contained in:
Jannat Patel
2022-10-31 11:50:36 +05:30
parent c6b917fa83
commit 915bbdf247
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/www/batch/learn.py
View File

@@ -16,10 +16,7 @@ def get_context(context):
}, "chapter") }, "chapter")
if not chapter_index or not lesson_index: if not chapter_index or not lesson_index:
if context.batch: index_ = "1.1"
index_ = get_lesson_index(context.course, context.batch, frappe.session.user) or "1.1"
else:
index_ = "1.1"
redirect_to_lesson(context.course, index_) redirect_to_lesson(context.course, index_)
context.lesson = get_current_lesson_details(lesson_number, context) context.lesson = get_current_lesson_details(lesson_number, context)
@@ -48,7 +45,7 @@ def get_context(context):
context.page_extensions = get_page_extensions(context) context.page_extensions = get_page_extensions(context)
context.page_context = { context.page_context = {
"course": context.course.name, "course": context.course.name,
"batch": context.get("batch") and context.batch.name, "batch": context.batch,
"lesson": context.lesson.name if context.lesson.name else "New Lesson", "lesson": context.lesson.name if context.lesson.name else "New Lesson",
"is_member": context.membership is not None "is_member": context.membership is not None
} }
@@ -72,11 +69,6 @@ def get_url(lesson_number, course):
return get_lesson_url(course.name, lesson_number) and get_lesson_url(course.name, lesson_number) + course.query_parameter return get_lesson_url(course.name, lesson_number) and get_lesson_url(course.name, lesson_number) + course.query_parameter
def get_lesson_index(course, batch, user):
lesson = batch.get_current_lesson(user)
return lesson and course.get_lesson_index(lesson)
def get_page_extensions(context): def get_page_extensions(context):
default_value = ["lms.plugins.PageExtension"] default_value = ["lms.plugins.PageExtension"]
classnames = frappe.get_hooks("lms_lesson_page_extensions") or default_value classnames = frappe.get_hooks("lms_lesson_page_extensions") or default_value

7
lms/www/utils.py
View File

@@ -17,12 +17,7 @@ def get_common_context(context):
context.lessons = get_lessons(course.name) context.lessons = get_lessons(course.name)
membership = get_membership(course.name, frappe.session.user, batch_name) membership = get_membership(course.name, frappe.session.user, batch_name)
context.membership = membership context.membership = membership
if membership: context.batch = membership.batch if membership.batch else None
batch = get_batch(course.name, membership.batch)
if batch:
context.batch = batch
context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else "" context.course.query_parameter = "?batch=" + membership.batch if membership and membership.batch else ""
context.livecode_url = get_livecode_url() context.livecode_url = get_livecode_url()