Merge branch 'develop' of https://github.com/frappe/lms into batch-dashboard-update

This commit is contained in:
Jannat Patel
2026-02-12 11:09:19 +05:30
4 changed files with 13 additions and 19 deletions

View File

@@ -160,7 +160,7 @@ def verify_billing_access(doctype, name, billing_type):
@frappe.whitelist(allow_guest=True)
def get_job_details(job):
def get_job_details(job: str):
return frappe.db.get_value(
"Job Opportunity",
job,
@@ -618,14 +618,14 @@ def check_app_permission():
def save_evaluation_details(
member: str,
course: str,
batch_name: str,
evaluator: str,
date: str,
start_time: str,
end_time: str,
status: str,
rating: float,
summary: str,
batch_name: str = None,
evaluator: str = None,
rating: float = 0,
summary: str = None,
):
"""
Save evaluation details for a member against a course.

View File

@@ -882,7 +882,8 @@ def get_course_details(course: str):
return {}
is_course_published = frappe.db.get_value("LMS Course", course, "published")
if not is_course_published and not can_modify_course(course):
membership = get_membership(course)
if not is_course_published and not can_modify_course(course) and not membership:
return {}
fields = get_course_fields()
@@ -894,6 +895,7 @@ def get_course_details(course: str):
)
course_details.instructors = get_instructors("LMS Course", course_details.name)
course_details.membership = membership
# course_details.is_instructor = is_instructor(course_details.name)
if course_details.paid_course or course_details.paid_certificate:
"""course_details.course_price, course_details.currency = check_multicurrency(
@@ -902,15 +904,7 @@ def get_course_details(course: str):
course_details.price = fmt_money(course_details.course_price, 0, course_details.currency)
if frappe.session.user == "Guest":
course_details.membership = None
course_details.is_instructor = False
else:
course_details.membership = frappe.db.get_value(
"LMS Enrollment",
{"member": frappe.session.user, "course": course_details.name},
["name", "course", "current_lesson", "progress", "member"],
as_dict=1,
)
if course_details.membership and course_details.membership.current_lesson:
course_details.current_lesson = get_lesson_index(course_details.membership.current_lesson)

View File

@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: jannat@frappe.io\n"
"POT-Creation-Date: 2026-01-23 16:05+0000\n"
"PO-Revision-Date: 2026-02-09 07:32\n"
"PO-Revision-Date: 2026-02-10 12:02\n"
"Last-Translator: jannat@frappe.io\n"
"Language-Team: Italian\n"
"MIME-Version: 1.0\n"
@@ -2291,7 +2291,7 @@ msgstr ""
#: lms/lms/doctype/lms_settings/lms_settings.json
#: lms/templates/signup-form.html:10
msgid "Email"
msgstr "E-mail"
msgstr "Email"
#: frontend/src/components/Modals/Event.vue:16
msgid "Email ID"

View File

@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: jannat@frappe.io\n"
"POT-Creation-Date: 2026-01-23 16:05+0000\n"
"PO-Revision-Date: 2026-02-05 06:43\n"
"PO-Revision-Date: 2026-02-11 13:22\n"
"Last-Translator: jannat@frappe.io\n"
"Language-Team: Burmese\n"
"MIME-Version: 1.0\n"
@@ -962,7 +962,7 @@ msgstr ""
#. Option for the 'Status' (Select) field in DocType 'LMS Certificate Request'
#: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
msgid "Cancelled"
msgstr ""
msgstr "ပယ်ဖျက်ခဲ့သည်။"
#. Label of the carrer_preference_details (Section Break) field in DocType
#. 'User'
@@ -5942,7 +5942,7 @@ msgstr ""
#: frontend/src/pages/Quizzes.vue:105
#: lms/job/web_form/job_opportunity/job_opportunity.json
msgid "Save"
msgstr ""
msgstr "သိမ်းမည်။"
#. Label of the schedule (Table) field in DocType 'Course Evaluator'
#: lms/lms/doctype/course_evaluator/course_evaluator.json