From 1f46637cc28097ab25df600a4053df8cc2e5c24d Mon Sep 17 00:00:00 2001 From: bcornwellmott Date: Wed, 2 Aug 2017 04:26:56 -0700 Subject: [PATCH] Fix workflow override (#3824) --- frappe/public/js/frappe/list/list_renderer.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index 65f52c910c..394d7d3f16 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -410,7 +410,7 @@ frappe.views.ListRenderer = Class.extend({ }, get_indicator_html: function (doc) { - var indicator = frappe.get_indicator(doc, this.doctype); + var indicator = this.get_indicator_from_doc(doc); if (indicator) { return ` @@ -419,15 +419,18 @@ frappe.views.ListRenderer = Class.extend({ } return ''; }, - get_indicator_dot: function (doc) { - var indicator = frappe.get_indicator(doc, this.doctype); + var indicator = this.get_indicator_from_doc(doc); if (!indicator) { return ''; } return ``; }, - + get_indicator_from_doc: function (doc) { + var workflow = frappe.workflow.workflows[this.doctype]; + var override = workflow ? workflow['override_status'] : true; + return frappe.get_indicator(doc, this.doctype, override); + }, prepare_data: function (data) { if (data.modified) this.prepare_when(data, data.modified);