From 8230ce095f8159266a97ca97c3d22501ce96d628 Mon Sep 17 00:00:00 2001 From: Manas Solanki Date: Fri, 21 Apr 2017 16:13:17 +0530 Subject: [PATCH] [Fix] fixed routing to the assessment result --- .../schools/doctype/assessment_plan/assessment_plan.js | 2 +- .../assessment_result_tool/assessment_result_tool.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js index 9685e0ef836..cafe3a10e83 100644 --- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js +++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js @@ -8,7 +8,7 @@ cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name"); frappe.ui.form.on("Assessment Plan", { refresh: function(frm) { - if (!frm.doc.__islocal) { + if (frm.doc.docstatus == 1) { frm.add_custom_button(__("Assessment Result"), function() { frappe.route_options = { assessment_plan: frm.doc.name diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js index 8fd670eca48..6967a7d2938 100644 --- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js +++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js @@ -5,6 +5,14 @@ cur_frm.add_fetch("assessment_plan", "student_group", "student_group"); cur_frm.add_fetch("assessment_plan", "student_batch", "student_batch"); frappe.ui.form.on('Assessment Result Tool', { + + onload: function(frm) { + if (frappe.route_options) { + frm.doc.assessment_plan = frappe.route_options.assessment_plan; + frappe.route_options = null; + } + }, + refresh: function(frm) { frm.disable_save(); frm.page.clear_indicator();