Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: assessment plan error handling for course field (#23961)

Browse Source 
* fix: assessment plan error handling for course field

* fix: message rectification

* fix(travis): clean-up tests

* fix: travis

* fix: tests

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
This commit is contained in:
Jannat Patel 2021-01-13 12:56:04 +05:30 committed by GitHub
parent 1c362c81f2
commit 8aeadc743e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
erpnext/education/doctype/program_enrollment/program_enrollment.py
View File

@ -124,21 +124,24 @@ class ProgramEnrollment(Document):
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs
def get_program_courses(doctype, txt, searchfield, start, page_len, filters): def get_program_courses(doctype, txt, searchfield, start, page_len, filters):
if filters.get('program'): if not filters.get('program'):
return frappe.db.sql("""select course, course_name from `tabProgram Course` frappe.msgprint(_("Please select a Program first."))
where parent = %(program)s and course like %(txt)s {match_cond} return []
order by
if(locate(%(_txt)s, course), locate(%(_txt)s, course), 99999), return frappe.db.sql("""select course, course_name from `tabProgram Course`
idx desc, where parent = %(program)s and course like %(txt)s {match_cond}
`tabProgram Course`.course asc order by
limit {start}, {page_len}""".format( if(locate(%(_txt)s, course), locate(%(_txt)s, course), 99999),
match_cond=get_match_cond(doctype), idx desc,
start=start, `tabProgram Course`.course asc
page_len=page_len), { limit {start}, {page_len}""".format(
"txt": "%{0}%".format(txt), match_cond=get_match_cond(doctype),
"_txt": txt.replace('%', ''), start=start,
"program": filters['program'] page_len=page_len), {
}) "txt": "%{0}%".format(txt),
"_txt": txt.replace('%', ''),
"program": filters['program']
})
@frappe.whitelist() @frappe.whitelist()
@frappe.validate_and_sanitize_search_inputs @frappe.validate_and_sanitize_search_inputs