From 5079e6c1c1c7605f0d515f17c1d2c60ee3f27a03 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Mon, 22 Apr 2019 14:46:26 +0530 Subject: [PATCH] chore: minor improvements --- erpnext/education/utils.py | 3 ++- erpnext/www/lms.py | 8 +++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/erpnext/education/utils.py b/erpnext/education/utils.py index d7b768e1e1a..bf766adc099 100644 --- a/erpnext/education/utils.py +++ b/erpnext/education/utils.py @@ -96,6 +96,8 @@ def get_program_and_enrollment_status(program_name): def get_course_enrollment(course_name): student = get_current_student() + if not student: + return None enrollment_name = frappe.get_all("Course Enrollment", filters={'student': student.name, 'course':course_name}) try: name = enrollment_name[0].name @@ -114,7 +116,6 @@ def create_student_from_current_user(): "user": frappe.session.user }) student.save(ignore_permissions=True) - frappe.db.commit() return student def enroll_in_course(course_name, program_name): diff --git a/erpnext/www/lms.py b/erpnext/www/lms.py index 69424e1f7d2..81818237e70 100644 --- a/erpnext/www/lms.py +++ b/erpnext/www/lms.py @@ -119,7 +119,7 @@ def evaluate_quiz(course, quiz_response, quiz_name): def enroll_in_program(program_name): student = utils.get_current_student() if not student: - utils.create_student_from_current_user() + student = utils.create_student_from_current_user() program_enrollment = student.enroll_in_program(program_name) return program_name @@ -215,11 +215,9 @@ def get_program_progress(program_name): @frappe.whitelist() def get_joining_date(): - current_student = utils.get_current_student() - if current_student: + student = utils.get_current_student() + if student: return student.joining_date - else: - return None @frappe.whitelist() def get_quiz_progress(program_name):