eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: replaced instances of batch to batch_old

Browse Source
This commit is contained in:
Jannat Patel
2023-08-26 15:28:03 +05:30
parent 12b3d16662
commit 09dbe0fed7
11 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lms/www/batch/join.py
View File

@@ -4,8 +4,8 @@ import frappe
def get_context(context):
context.no_cache = 1
batch_name = frappe.form_dict["batch"]
context.batch = frappe.get_doc("LMS Batch Old", batch_name)
context.already_a_member = context.batch.is_member(frappe.session.user)
context.batch.course_title = frappe.db.get_value(
"LMS Course", context.batch.course, "title"
context.batch_old = frappe.get_doc("LMS Batch Old", batch_name)
context.already_a_member = context.batch_old.is_member(frappe.session.user)
context.batch_old.course_title = frappe.db.get_value(
"LMS Course", context.batch_old.course, "title"
)

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

@@ -72,7 +72,7 @@ def get_context(context):
context.page_extensions = get_page_extensions(context)
context.page_context = {
"course": context.course.name,
"batch": context.batch,
"batch": context.batch_old,
"lesson": context.lesson.name if context.lesson.name else "New Lesson",
"is_member": context.membership is not None,
}

2
lms/www/courses/course.py
View File

@@ -85,7 +85,7 @@ def set_course_context(context, course_name):
context.course = course
membership = get_membership(course.name, frappe.session.user)
context.course.query_parameter = (
"?batch=" + membership.batch if membership and membership.batch else ""
"?batch=" + membership.batch_old if membership and membership.batch_old else ""
)
context.membership = membership
context.is_instructor = is_instructor(course.name)

6
lms/www/utils.py
View File

@@ -27,9 +27,11 @@ def get_common_context(context):
membership = get_membership(course.name, frappe.session.user, batch_name)
context.membership = membership
context.progress = frappe.utils.cint(membership.progress) if membership else 0
context.batch = membership.batch if membership and membership.batch else None
context.batch_old = (
membership.batch_old if membership and membership.batch_old else None
)
context.course.query_parameter = (
"?batch=" + membership.batch if membership and membership.batch else ""
"?batch=" + membership.batch_old if membership and membership.batch_old else ""
)
context.livecode_url = get_livecode_url()