From 05225e077e9d2e15490545931ff3226d99043a6a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 1 Jan 2024 11:56:09 +0530 Subject: [PATCH 1/2] fix: broken `dynamic_link` to `link` formatting in query report --- frappe/public/js/frappe/views/reports/query_report.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 67cc7e5c2a..32353b8a02 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1259,13 +1259,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { width: parseInt(column.width) || null, editable: false, compareValue: compareFn, - format: (value, row, column, data, filter, data1) => { + format: (value, row, column, data, filter) => { if (this.report_settings.formatter) { return this.report_settings.formatter( value, row, column, - data1, + data, format_cell, filter ); From 2ef75be7ffdfd3012f736fa78c4ab147551b63bf Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 2 Jan 2024 12:35:10 +0530 Subject: [PATCH 2/2] chore: update datatable --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 5ec8402fe3..2f2f257a2a 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "fast-deep-equal": "^2.0.1", "fast-glob": "^3.2.5", "frappe-charts": "2.0.0-rc22", - "frappe-datatable": "^1.17.9", + "frappe-datatable": "1.17.10", "frappe-gantt": "^0.6.0", "highlight.js": "^10.4.1", "html5-qrcode": "^2.3.8", diff --git a/yarn.lock b/yarn.lock index 98a9877253..cb1c54da48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1497,10 +1497,10 @@ frappe-charts@2.0.0-rc22: resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc22.tgz#9a5a747febdc381a1d4d7af96e89cf519dfba8c0" integrity sha512-N7f/8979wJCKjusOinaUYfMxB80YnfuVLrSkjpj4LtyqS0BGS6SuJxUnb7Jl4RWUFEIs7zEhideIKnyLeFZF4Q== -frappe-datatable@^1.17.9: - version "1.17.9" - resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.17.9.tgz#5ef4e5d335079ab5bf2abfecc916e31ecf17a5cb" - integrity sha512-C1U5YKk7kP32eiHVnv1AdY5LafKKoGrcDpbErqM95PYrhanaq2Uvkvdsjo6yioLpPfnvFD8Vihm4JoGc8FjDcw== +frappe-datatable@1.17.10: + version "1.17.10" + resolved "https://registry.yarnpkg.com/frappe-datatable/-/frappe-datatable-1.17.10.tgz#8526e0e360b493a72114afd2a4dc4c155b4a14dd" + integrity sha512-D537Kfs9F/P8kw7tk/yvdNc/mexRShOlCJc4dL1yPXk6wXIXthFiniq+R8P8jh61aHLqLQr0LmPahAI40+9v+w== dependencies: hyperlist "^1.0.0-beta" lodash "^4.17.5"