瀏覽代碼

[Urgent] Wrong workflow status showing on the form (#3940)

version-14
rohitwaghchaure 8 年之前
committed by Makarand Bauskar
父節點
當前提交
cd5867da01
共有 2 個文件被更改,包括 6 次插入8 次删除
  1. +2
    -7
      frappe/public/js/frappe/list/list_renderer.js
  2. +4
    -1
      frappe/public/js/frappe/model/indicator.js

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

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

get_indicator_html: function (doc) {
var indicator = this.get_indicator_from_doc(doc);
var indicator = frappe.get_indicator(doc, this.doctype);
if (indicator) {
return `<span class='indicator ${indicator[1]} filterable'
data-filter='${indicator[2]}'>
@@ -420,17 +420,12 @@ frappe.views.ListRenderer = Class.extend({
return '';
},
get_indicator_dot: function (doc) {
var indicator = this.get_indicator_from_doc(doc);
var indicator = frappe.get_indicator(doc, this.doctype);
if (!indicator) {
return '';
}
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) {
if (data.modified)
this.prepare_when(data, data.modified);


+ 4
- 1
frappe/public/js/frappe/model/indicator.js 查看文件

@@ -14,13 +14,16 @@ frappe.has_indicator = function(doctype) {
return false;
}

frappe.get_indicator = function(doc, doctype, without_workflow = true) {
frappe.get_indicator = function(doc, doctype) {
if(doc.__unsaved) {
return [__("Not Saved"), "orange"];
}

if(!doctype) doctype = doc.doctype;

var workflow = frappe.workflow.workflows[doctype];
var without_workflow = workflow ? workflow['override_status'] : true;

var settings = frappe.listview_settings[doctype] || {};

var is_submittable = frappe.model.is_submittable(doctype),


Loading…
取消
儲存