From 18bfb6df5a47b6a19afc622909c59cd91e76a4e3 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 16 Oct 2018 10:14:35 +0530 Subject: [PATCH 1/6] fix(formatter): Item Link formatter when input is disabled (#6263) --- frappe/public/js/legacy/client_script_helpers.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/legacy/client_script_helpers.js b/frappe/public/js/legacy/client_script_helpers.js index 1abac46bfa..8a7e7dd319 100644 --- a/frappe/public/js/legacy/client_script_helpers.js +++ b/frappe/public/js/legacy/client_script_helpers.js @@ -436,10 +436,11 @@ _f.Frm.prototype.set_indicator_formatter = function(fieldname, get_color, get_te frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { if(value) { + const escaped_name = encodeURIComponent(value); return repl('%(label)s', { color: get_color(doc || {}), doctype: df.options, - name: value, + name: escaped_name, label: get_text ? get_text(doc) : value }); } else { @@ -516,4 +517,4 @@ _f.Frm.prototype.get_sum = function(table_fieldname, fieldname) { sum += d[fieldname]; } return sum; -}; \ No newline at end of file +}; From 2ce830a0f06ec01f6751edeb1b706742379c3e10 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 16 Oct 2018 12:50:30 +0530 Subject: [PATCH 2/6] [Fix] Date between filter is not working --- frappe/public/js/frappe/ui/filters/filter.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index 53acb8ef89..21fc8de216 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -139,7 +139,9 @@ frappe.ui.Filter = class { value = value.join(','); } - if (value !== undefined || value !== null) { + if (Array.isArray(value)) { + this._filter_value_set = this.field.set_value(value); + } else if (value !== undefined || value !== null) { this._filter_value_set = this.field.set_value((value + '').trim()); } return this._filter_value_set; From b4344576482cd71e4c09f76f297749ea41cde599 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 16 Oct 2018 14:27:07 +0530 Subject: [PATCH 3/6] [Fix] Prepared report breaking if no data --- frappe/desk/query_report.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index c75a7df09e..8c3dbd7bdc 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -191,10 +191,11 @@ def get_prepared_report_result(report, filters, dn=""): doc = frappe.get_doc("Prepared Report", doc_list[0]) data = read_csv_content_from_attached_file(doc) - latest_report_data = { - "columns": data[0], - "result": data[1:] - } + if data: + latest_report_data = { + "columns": data[0], + "result": data[1:] + } latest_report_data.update({ "prepared_report": True, From 226c0172831fc8e7032cba39ac2a045ea4e6c140 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Tue, 16 Oct 2018 16:14:46 +0530 Subject: [PATCH 4/6] Report fixes v11 (#6269) * fix(Report): Update datatable for multi column filters * fix(Report): Show totals for child table columns --- frappe/public/js/frappe/views/reports/report_view.js | 10 +++++----- package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 556d12fd69..02f617e141 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -799,8 +799,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { const totals = this.get_columns_totals(data); const totals_row = this.columns.map((col, i) => { return { - name: 'Totals Row', - content: totals[col.field], + name: __('Totals Row'), + content: totals[col.id], format: value => { return frappe.format(value, col.docfield, { always_show_decimals: true }); } @@ -942,13 +942,13 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.columns.forEach((col, i) => { const totals = data.reduce((totals, d) => { - if (col.field in d && frappe.model.is_numeric_field(col.docfield)) { - totals += flt(d[col.field]); + if (col.id in d && frappe.model.is_numeric_field(col.docfield)) { + totals += flt(d[col.id]); return totals; } }, 0); - row_totals[col.field] = totals; + row_totals[col.id] = totals; }); return row_totals; diff --git a/package.json b/package.json index 02156fc126..17b6e8300b 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "awesomplete": "^1.1.2", "cookie": "^0.3.1", "express": "^4.16.2", - "frappe-datatable": "^1.4.2", + "frappe-datatable": "^1.5.0", "frappe-gantt": "^0.1.0", "fuse.js": "^3.2.0", "highlight.js": "^9.12.0", diff --git a/yarn.lock b/yarn.lock index 15d65acf5d..28b5052988 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1224,10 +1224,10 @@ forwarded@~0.1.2: resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= -frappe-datatable@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.4.2.tgz#1b6dc401cf3aa72a9b6d12547d4f2aa0b6a95ab3" - integrity sha512-+V2+rD3tpciWmAzor6Mu/tl9nlgg0Y1VajNwWKkM5q0degmSVyS9moC5IzmlmgPogBWlYF6XOUC/xHKrHJij1A== +frappe-datatable@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.5.0.tgz#eea78a87e799876b71e58dbdc128fd9badb5e2c6" + integrity sha512-h9yP33UqRcEfcs5FVSFFUigya/KT5qFrB1vOqayhxqPoxdVH2pGKi+Qh/BO5KRNd6uVk8rVwXMhA8A9TU+2uEg== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5" From 9a24ce1814c509e62525ae3c264c52bead04671c Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 17 Oct 2018 09:02:44 +0000 Subject: [PATCH 5/6] bumped to version 10.1.53 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index c0491318ee..996458ec6f 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__ = '10.1.52' +__version__ = '10.1.53' __title__ = "Frappe Framework" local = Local() From 1cb0815faf80003967815a0a696e880311221c26 Mon Sep 17 00:00:00 2001 From: Ameya Shenoy Date: Wed, 17 Oct 2018 09:42:39 +0000 Subject: [PATCH 6/6] bumped to version 11.0.3-beta.11 --- frappe/hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 661edfd6fd..748c8dfeb6 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe" app_license = "MIT" develop_version = '11.x.x-develop' -staging_version = '11.0.3-beta.10' +staging_version = '11.0.3-beta.11' app_email = "info@frappe.io"