From 492aff2a8b5a91df74a7f3f839de45a336b9fb9d Mon Sep 17 00:00:00 2001 From: Saurabh Date: Tue, 17 Apr 2018 14:21:40 +0530 Subject: [PATCH] [fix] check if academic_year exists (#13665) --- .../doctype/student_group/student_group.js | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/erpnext/education/doctype/student_group/student_group.js b/erpnext/education/doctype/student_group/student_group.js index f3f8c88624..5373df9124 100644 --- a/erpnext/education/doctype/student_group/student_group.js +++ b/erpnext/education/doctype/student_group/student_group.js @@ -82,36 +82,39 @@ frappe.ui.form.on("Student Group", { max_roll_no = d.group_roll_number; } }); - frappe.call({ - method: "erpnext.education.doctype.student_group.student_group.get_students", - args: { - "academic_year": frm.doc.academic_year, - "academic_term": frm.doc.academic_term, - "group_based_on": frm.doc.group_based_on, - "program": frm.doc.program, - "batch" : frm.doc.batch, - "course": frm.doc.course - }, - callback: function(r) { - if(r.message) { - $.each(r.message, function(i, d) { - if(!in_list(student_list, d.student)) { - var s = frm.add_child("students"); - s.student = d.student; - s.student_name = d.student_name; - if (d.active === 0) { - s.active = 0; + + if(frm.doc.academic_year) { + frappe.call({ + method: "erpnext.education.doctype.student_group.student_group.get_students", + args: { + "academic_year": frm.doc.academic_year, + "academic_term": frm.doc.academic_term, + "group_based_on": frm.doc.group_based_on, + "program": frm.doc.program, + "batch" : frm.doc.batch, + "course": frm.doc.course + }, + callback: function(r) { + if(r.message) { + $.each(r.message, function(i, d) { + if(!in_list(student_list, d.student)) { + var s = frm.add_child("students"); + s.student = d.student; + s.student_name = d.student_name; + if (d.active === 0) { + s.active = 0; + } + s.group_roll_number = ++max_roll_no; } - s.group_roll_number = ++max_roll_no; - } - }); - refresh_field("students"); - frm.save(); - } else { - frappe.msgprint(__("Student Group is already updated.")) + }); + refresh_field("students"); + frm.save(); + } else { + frappe.msgprint(__("Student Group is already updated.")) + } } - } - }) + }) + } } else { frappe.msgprint(__("Select students manually for the Activity based Group")); }