Browse Source

Merge branch 'hotfix'

version-14
mbauskar 8 years ago
parent
commit
67e13e45f0
3 changed files with 8 additions and 4 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -1
      frappe/public/js/frappe/list/list_renderer.js
  3. +5
    -2
      frappe/tests/ui/data/test_lib.js

+ 1
- 1
frappe/__init__.py View File

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import * from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template


__version__ = '8.7.2'
__version__ = '8.7.3'
__title__ = "Frappe Framework" __title__ = "Frappe Framework"


local = Local() local = Local()


+ 2
- 1
frappe/public/js/frappe/list/list_renderer.js View File

@@ -428,7 +428,8 @@ frappe.views.ListRenderer = Class.extend({
}, },
get_indicator_from_doc: function (doc) { get_indicator_from_doc: function (doc) {
var workflow = frappe.workflow.workflows[this.doctype]; var workflow = frappe.workflow.workflows[this.doctype];
return frappe.get_indicator(doc, this.doctype, (workflow && workflow['override_status']) || true);
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)


+ 5
- 2
frappe/tests/ui/data/test_lib.js View File

@@ -54,14 +54,17 @@ frappe.tests = {
// build tasks for each row // build tasks for each row
value.forEach(d => { value.forEach(d => {
grid_row_tasks.push(() => { grid_row_tasks.push(() => {
grid.add_new_row();
let grid_row = grid.get_row(-1).toggle_view(true);

let grid_value_tasks = []; let grid_value_tasks = [];
grid_value_tasks.push(() => grid.add_new_row());
grid_value_tasks.push(() => grid.get_row(-1).toggle_view(true));
grid_value_tasks.push(() => frappe.timeout(0.5));


// build tasks to set each row value // build tasks to set each row value
d.forEach(child_value => { d.forEach(child_value => {
for (let child_key in child_value) { for (let child_key in child_value) {
grid_value_tasks.push(() => { grid_value_tasks.push(() => {
let grid_row = grid.get_row(-1);
return frappe.model.set_value(grid_row.doc.doctype, return frappe.model.set_value(grid_row.doc.doctype,
grid_row.doc.name, child_key, child_value[child_key]); grid_row.doc.name, child_key, child_value[child_key]);
}); });


Loading…
Cancel
Save