From d7c993f02831f218489ac2bbc89fb57f3256d034 Mon Sep 17 00:00:00 2001 From: scmmishra Date: Tue, 13 Nov 2018 12:22:49 +0530 Subject: [PATCH] Minor UI changes --- .../js/education/academy/components/AcademyCourseCard.vue | 5 ++++- erpnext/www/academy.py | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/erpnext/public/js/education/academy/components/AcademyCourseCard.vue b/erpnext/public/js/education/academy/components/AcademyCourseCard.vue index 16ffc558d2..e33f0b063e 100644 --- a/erpnext/public/js/education/academy/components/AcademyCourseCard.vue +++ b/erpnext/public/js/education/academy/components/AcademyCourseCard.vue @@ -53,9 +53,12 @@ export default { else if (this.courseMeta.flag == "Complete" ) { return "success" } - else { + else if (this.courseMeta.flag == "Continue" ) { return "info" } + else { + return " hidden" + } } } }; diff --git a/erpnext/www/academy.py b/erpnext/www/academy.py index 48cbbc496d..294c41f1e7 100644 --- a/erpnext/www/academy.py +++ b/erpnext/www/academy.py @@ -84,8 +84,8 @@ def get_courses(program_name): @frappe.whitelist() def get_continue_content(course_name): - if(frappe.session.user == "Guest"): - return None + if frappe.session.user == "Guest": + return dict(content=None, content_type=None, flag=None) enrollment = get_enrollment(course_name) course = frappe.get_doc("Course", enrollment.course) last_activity = enrollment.get_last_activity() @@ -126,6 +126,8 @@ def get_content(content_name, content_type): @frappe.whitelist() def get_next_content(content, content_type, course): + if frappe.session.user == "Guest": + return None course_doc = frappe.get_doc("Course", course) content_list = [{'content_type':item.content_type, 'content':item.content} for item in course_doc.get_all_children()] current_index = content_list.index({'content': content, 'content_type': content_type})