From e1120eed5d8fab7fc8bd70046c26d47eb105de1a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 2 Apr 2021 13:31:40 +0530 Subject: [PATCH 1/4] fix: Reload website_theme_ignore_app before Website Theme (cherry picked from commit aaea55ed7de6a0b7adca469d19bc5abf9706b46f) --- frappe/patches/v13_0/website_theme_custom_scss.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v13_0/website_theme_custom_scss.py b/frappe/patches/v13_0/website_theme_custom_scss.py index a5f08324e883..569d19111ba0 100644 --- a/frappe/patches/v13_0/website_theme_custom_scss.py +++ b/frappe/patches/v13_0/website_theme_custom_scss.py @@ -1,9 +1,9 @@ import frappe def execute(): - frappe.reload_doctype('Website Theme') frappe.reload_doc('website', 'doctype', 'website_theme_ignore_app') frappe.reload_doc('website', 'doctype', 'color') + frappe.reload_doctype('Website Theme') for theme in frappe.get_all('Website Theme'): doc = frappe.get_doc('Website Theme', theme.name) From 4d218fe10839e5810300d748ce83770e010c0d40 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 4 Apr 2021 10:12:10 +0530 Subject: [PATCH 2/4] fix: Check if df.options exists before setting docfields Fixes: https://github.com/frappe/frappe/issues/12793 (cherry picked from commit a71066f3a42f0888e967f51e44886f7db9c4dd8f) --- frappe/public/js/frappe/form/grid_row.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index bebf46e93db5..5e3a2b8ccd88 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -5,7 +5,7 @@ export default class GridRow { this.on_grid_fields_dict = {}; this.on_grid_fields = []; $.extend(this, opts); - if (this.doc) { + if (this.doc && this.parent_df.options) { this.docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); } this.columns = {}; @@ -255,6 +255,7 @@ export default class GridRow { this.grid.visible_columns.forEach((col, ci) => { // to get update df for the row let df = this.docfields.find(field => field.fieldname === col[0].fieldname); + let colsize = col[1]; let txt = this.doc ? frappe.format(this.doc[df.fieldname], df, null, this.doc) : From a4b166e71fa8985b920e4b8230273c51dcb60b34 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 4 Apr 2021 12:30:21 +0530 Subject: [PATCH 3/4] chore: Bump version to v13.0.1 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 25d835bec3ae..0645dce367e7 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -33,7 +33,7 @@ reload(sys) sys.setdefaultencoding("utf-8") -__version__ = '13.0.0' +__version__ = '13.0.1' __title__ = "Frappe Framework" From 4453303b4c3d18610352dbeea250bff976c80a46 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 5 Apr 2021 12:16:04 +0530 Subject: [PATCH 4/4] fix: Handle exception while building version comment (bp #12801) (#12802) (cherry picked from commit 13e7f453fcc70e90fd5dfff4d81bc3ddddc2b1d5) Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- .../version_timeline_content_builder.js | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js index a56328641358..cbfd620e4c74 100644 --- a/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js +++ b/frappe/public/js/frappe/form/footer/version_timeline_content_builder.js @@ -151,19 +151,23 @@ function get_version_comment(version_doc, text) { let version_comment = ""; let unlinked_content = ""; - Array.from($(text)).forEach(element => { - if ($(element).is('a')) { - version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : ""; - unlinked_content = ""; - version_comment += element.outerHTML; - } else { - unlinked_content += element.outerHTML || element.textContent; + try { + Array.from($(text)).forEach(element => { + if ($(element).is('a')) { + version_comment += unlinked_content ? frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content) : ""; + unlinked_content = ""; + version_comment += element.outerHTML; + } else { + unlinked_content += element.outerHTML || element.textContent; + } + }); + if (unlinked_content) { + version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content); } - }); - if (unlinked_content) { - version_comment += frappe.utils.get_form_link('Version', version_doc.name, true, unlinked_content); + return version_comment; + } catch (e) { + // pass } - return version_comment; } return frappe.utils.get_form_link('Version', version_doc.name, true, text); }