From fdce7a0dc3f0bc96d3f891ce3eb0fdcfedd348b1 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 24 May 2017 17:31:58 +0530 Subject: [PATCH] Revert "link the different doctype in the school module (#8844)" This reverts commit c320537e4ca682c6139fd5cb40fa0cf61a0cd2bb. --- erpnext/schools/doctype/course/course.js | 12 ------------ erpnext/schools/doctype/program/program.js | 15 --------------- .../student_attendance_tool.js | 6 ------ .../doctype/student_group/student_group.js | 17 +---------------- 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js index c667eca2b7..f84c59fcd2 100644 --- a/erpnext/schools/doctype/course/course.js +++ b/erpnext/schools/doctype/course/course.js @@ -1,30 +1,18 @@ frappe.ui.form.on("Course", "refresh", function(frm) { if(!cur_frm.doc.__islocal) { frm.add_custom_button(__("Program"), function() { - frappe.route_options = { - "Program Course.course": frm.doc.name - } frappe.set_route("List", "Program"); }); frm.add_custom_button(__("Student Group"), function() { - frappe.route_options = { - course: frm.doc.name - } frappe.set_route("List", "Student Group"); }); frm.add_custom_button(__("Course Schedule"), function() { - frappe.route_options = { - course: frm.doc.name - } frappe.set_route("List", "Course Schedule"); }); frm.add_custom_button(__("Assessment Plan"), function() { - frappe.route_options = { - course: frm.doc.name - } frappe.set_route("List", "Assessment Plan"); }); } diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/schools/doctype/program/program.js index 5146a19322..cc09d0ef4d 100644 --- a/erpnext/schools/doctype/program/program.js +++ b/erpnext/schools/doctype/program/program.js @@ -6,37 +6,22 @@ cur_frm.add_fetch('fee_structure', 'total_amount', 'amount'); frappe.ui.form.on("Program", "refresh", function(frm) { if(!frm.doc.__islocal) { frm.add_custom_button(__("Student Applicant"), function() { - frappe.route_options = { - program: frm.doc.name - } frappe.set_route("List", "Student Applicant"); }); frm.add_custom_button(__("Program Enrollment"), function() { - frappe.route_options = { - program: frm.doc.name - } frappe.set_route("List", "Program Enrollment"); }); frm.add_custom_button(__("Student Group"), function() { - frappe.route_options = { - program: frm.doc.name - } frappe.set_route("List", "Student Group"); }); frm.add_custom_button(__("Fee Structure"), function() { - frappe.route_options = { - program: frm.doc.name - } frappe.set_route("List", "Fee Structure"); }); frm.add_custom_button(__("Fees"), function() { - frappe.route_options = { - program: frm.doc.name - } frappe.set_route("List", "Fees"); }); } diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js index 11a79e134e..6f8c6cd7da 100644 --- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js @@ -4,12 +4,6 @@ frappe.provide("schools") frappe.ui.form.on('Student Attendance Tool', { refresh: function(frm) { - if (frappe.route_options) { - frm.set_value("based_on", frappe.route_options.based_on); - frm.set_value("student_group", frappe.route_options.student_group); - frm.set_value("course_schedule", frappe.route_options.course_schedule); - frappe.route_options = null; - } frm.disable_save(); }, diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js index 83fe0945cc..ed9469015b 100644 --- a/erpnext/schools/doctype/student_group/student_group.js +++ b/erpnext/schools/doctype/student_group/student_group.js @@ -13,23 +13,11 @@ frappe.ui.form.on("Student Group", { refresh: function(frm) { if (!frm.doc.__islocal) { - frm.add_custom_button(__("Attendance"), function() { - frappe.route_options = { - based_on: "Student Group", - student_group: frm.doc.name - } - frappe.set_route("List", "Student Attendance Tool"); - }); frm.add_custom_button(__("Course Schedule"), function() { - frappe.route_options = { - student_group: frm.doc.name - } frappe.set_route("List", "Course Schedule"); }); + frm.add_custom_button(__("Assessment Plan"), function() { - frappe.route_options = { - student_group: frm.doc.name - } frappe.set_route("List", "Assessment Plan"); }); frm.add_custom_button(__("Update Email Group"), function() { @@ -42,9 +30,6 @@ frappe.ui.form.on("Student Group", { }); }); frm.add_custom_button(__("Newsletter"), function() { - frappe.route_options = { - "Newsletter Email Group.email_group": frm.doc.name - } frappe.set_route("List", "Newsletter"); }); }