nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-14 18:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: renamed get_program api functions

Browse Source 
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
This commit is contained in:
scmmishra
2019-04-22 12:19:39 +05:30
parent 9967d27b9a
commit da2c90cd18
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/education/utils.py
View File

@@ -89,7 +89,7 @@ def get_program_enrollment(program_name):
else: else:
return None return None
def get_program(program_name): def get_program_and_enrollment_status(program_name):
program = frappe.get_doc('Program', program_name) program = frappe.get_doc('Program', program_name)
is_enrolled = bool(get_program_enrollment(program_name)) or check_super_access() is_enrolled = bool(get_program_enrollment(program_name)) or check_super_access()
return {'program': program, 'is_enrolled': is_enrolled} return {'program': program, 'is_enrolled': is_enrolled}

2
erpnext/public/js/education/lms/pages/ProgramPage.vue
View File

@@ -35,7 +35,7 @@ export default {
}, },
methods: { methods: {
getProgramDetails() { getProgramDetails() {
return lms.call('get_program_details', { return lms.call('get_program', {
program_name: this.program_name program_name: this.program_name
}); });
}, },

15
erpnext/www/lms.py
View File

@@ -34,7 +34,7 @@ def get_portal_details():
def get_featured_programs(): def get_featured_programs():
featured_program_names = frappe.get_all("Program", filters={"is_published": True, "is_featured": True}) featured_program_names = frappe.get_all("Program", filters={"is_published": True, "is_featured": True})
if featured_program_names: if featured_program_names:
featured_list = [utils.get_program(program['name']) for program in featured_program_names] featured_list = [utils.get_program_and_enrollment_status(program['name']) for program in featured_program_names]
return featured_list return featured_list
else: else:
return get_all_programs()[:2] return get_all_programs()[:2]
@@ -43,18 +43,15 @@ def get_featured_programs():
def get_all_programs(): def get_all_programs():
program_names = frappe.get_all("Program", filters={"is_published": True}) program_names = frappe.get_all("Program", filters={"is_published": True})
if program_names: if program_names:
program_list = [utils.get_program(program['name']) for program in program_names] program_list = [utils.get_program_and_enrollment_status(program['name']) for program in program_names]
return program_list return program_list
else:
return None
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)
def get_program_details(program_name): def get_program(program_name):
try: try:
program = frappe.get_doc('Program', program_name) return frappe.get_doc('Program', program_name)
return program except frappe.DoesNotExistError:
except: frappe.throw(_("Program {0} does not exist.".format(program_name)))
return None
# Functions to get program & course details # Functions to get program & course details
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)