From c52bb5ac576c51c785047a58b7789f3077ac3b8e Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Sun, 30 Jul 2017 05:37:11 -0700 Subject: [PATCH 1/5] Fix workflow override --- frappe/public/js/frappe/list/list_renderer.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/list/list_renderer.js b/frappe/public/js/frappe/list/list_renderer.js index 02940e1bec..394d7d3f16 100644 --- a/frappe/public/js/frappe/list/list_renderer.js +++ b/frappe/public/js/frappe/list/list_renderer.js @@ -271,7 +271,10 @@ frappe.views.ListRenderer = Class.extend({ setup_filterable: function () { var me = this; + + this.list_view.wrapper && this.list_view.wrapper.on('click', '.result-list .filterable', function (e) { + e.stopPropagation(); var filters = $(this).attr('data-filter').split('|'); var added = false; @@ -294,7 +297,9 @@ frappe.views.ListRenderer = Class.extend({ me.list_view.refresh(true); } }); - this.wrapper.on('click', '.list-item', function (e) { + + this.list_view.wrapper && + this.list_view.wrapper.on('click', '.list-item', function (e) { // don't open in case of checkbox, like, filterable if ($(e.target).hasClass('filterable') || $(e.target).hasClass('octicon-heart') @@ -405,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 ` @@ -414,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); From 880361db46001efb8b24b03c91f12a392e0632cc Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 9 Aug 2017 17:51:39 +0530 Subject: [PATCH 2/5] [hotfix] fixes for Uncaught TypeError: Cannot read property 'doc' of undefined (#3886) --- frappe/tests/ui/data/test_lib.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/tests/ui/data/test_lib.js b/frappe/tests/ui/data/test_lib.js index ec07cb52ba..75b225b38c 100644 --- a/frappe/tests/ui/data/test_lib.js +++ b/frappe/tests/ui/data/test_lib.js @@ -55,9 +55,11 @@ frappe.tests = { value.forEach(d => { grid_row_tasks.push(() => { grid.add_new_row(); - let grid_row = grid.get_row(-1).toggle_view(true); + let grid_row = grid.get_row(-1); let grid_value_tasks = []; + grid_row.toggle_view(true); + // build tasks to set each row value d.forEach(child_value => { for (let child_key in child_value) { From f5f1c42775a257a380cdec7fb80380d788309c30 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 9 Aug 2017 17:58:35 +0530 Subject: [PATCH 3/5] Revert "[hotfix] fixes for Uncaught TypeError: Cannot read property 'doc' of undefined (#3886)" This reverts commit 880361db46001efb8b24b03c91f12a392e0632cc. --- frappe/tests/ui/data/test_lib.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frappe/tests/ui/data/test_lib.js b/frappe/tests/ui/data/test_lib.js index 75b225b38c..ec07cb52ba 100644 --- a/frappe/tests/ui/data/test_lib.js +++ b/frappe/tests/ui/data/test_lib.js @@ -55,11 +55,9 @@ frappe.tests = { value.forEach(d => { grid_row_tasks.push(() => { grid.add_new_row(); - let grid_row = grid.get_row(-1); + let grid_row = grid.get_row(-1).toggle_view(true); let grid_value_tasks = []; - grid_row.toggle_view(true); - // build tasks to set each row value d.forEach(child_value => { for (let child_key in child_value) { From e586ef441e69a7300bae6ff3cce1861132340883 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Thu, 10 Aug 2017 14:55:16 +0530 Subject: [PATCH 4/5] [fix] multiple grid_row fetch (#3856) (#3892) --- frappe/tests/ui/data/test_lib.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/tests/ui/data/test_lib.js b/frappe/tests/ui/data/test_lib.js index ec07cb52ba..772be7a3bf 100644 --- a/frappe/tests/ui/data/test_lib.js +++ b/frappe/tests/ui/data/test_lib.js @@ -54,14 +54,17 @@ frappe.tests = { // build tasks for each row value.forEach(d => { grid_row_tasks.push(() => { - grid.add_new_row(); - let grid_row = grid.get_row(-1).toggle_view(true); + 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 d.forEach(child_value => { for (let child_key in child_value) { grid_value_tasks.push(() => { + let grid_row = grid.get_row(-1); return frappe.model.set_value(grid_row.doc.doctype, grid_row.doc.name, child_key, child_value[child_key]); }); From 31e9ad6b3f9f6dfaffff40637c1f01cde2a291b5 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Thu, 10 Aug 2017 16:42:06 +0600 Subject: [PATCH 5/5] bumped to version 8.7.3 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 2361500eab..a4c721c8ab 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * 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" local = Local()