浏览代码

Fix workflow override (#3824)

version-14
bcornwellmott 8 年前
committed by Rushabh Mehta
父节点
当前提交
1f46637cc2
共有 1 个文件被更改,包括 7 次插入4 次删除
  1. +7
    -4
      frappe/public/js/frappe/list/list_renderer.js

+ 7
- 4
frappe/public/js/frappe/list/list_renderer.js 查看文件

@@ -410,7 +410,7 @@ frappe.views.ListRenderer = Class.extend({
}, },


get_indicator_html: function (doc) { get_indicator_html: function (doc) {
var indicator = frappe.get_indicator(doc, this.doctype);
var indicator = this.get_indicator_from_doc(doc);
if (indicator) { if (indicator) {
return `<span class='indicator ${indicator[1]} filterable' return `<span class='indicator ${indicator[1]} filterable'
data-filter='${indicator[2]}'> data-filter='${indicator[2]}'>
@@ -419,15 +419,18 @@ frappe.views.ListRenderer = Class.extend({
} }
return ''; return '';
}, },

get_indicator_dot: function (doc) { get_indicator_dot: function (doc) {
var indicator = frappe.get_indicator(doc, this.doctype);
var indicator = this.get_indicator_from_doc(doc);
if (!indicator) { if (!indicator) {
return ''; return '';
} }
return `<span class='indicator ${indicator[1]}' title='${__(indicator[0])}'></span>`; return `<span class='indicator ${indicator[1]}' title='${__(indicator[0])}'></span>`;
}, },

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) { prepare_data: function (data) {
if (data.modified) if (data.modified)
this.prepare_when(data, data.modified); this.prepare_when(data, data.modified);


正在加载...
取消
保存