From bcf837cbb5129d8858792a247b06d8eb4707fc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Schl=C3=B6=C3=9Fer?= <63470585+Saboti215@users.noreply.github.com> Date: Wed, 5 Jul 2023 10:17:05 +0200 Subject: [PATCH 1/5] feat: Add ability to use HTML fields in grids --- frappe/core/doctype/doctype/doctype.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 6a1887f14a..c127335b16 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -1496,6 +1496,7 @@ def get_fields_not_allowed_in_list_view(meta) -> list[str]: not_allowed_in_list_view.append("Attach Image") if meta.istable: not_allowed_in_list_view.remove("Button") + not_allowed_in_list_view.remove("HTML") return not_allowed_in_list_view From 9cdebcfca7106faf204000c05f412a671893d7f6 Mon Sep 17 00:00:00 2001 From: Sabu Siyad Date: Tue, 11 Jul 2023 15:24:27 +0530 Subject: [PATCH 2/5] fix: typo: form builder: `Fetch Form` -> `Fetch From` (#21635) [skip ci] --- .../js/form_builder/components/controls/TextControl.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/form_builder/components/controls/TextControl.vue b/frappe/public/js/form_builder/components/controls/TextControl.vue index 91fe920bdb..afd4513c38 100644 --- a/frappe/public/js/form_builder/components/controls/TextControl.vue +++ b/frappe/public/js/form_builder/components/controls/TextControl.vue @@ -33,12 +33,12 @@ let doctype_df = computed(() => { })); let options = [{ label: __("Select DocType"), value: "" }, ...doctypes.value]; - return { fieldtype: "Select", label: __("Fetch Form"), options }; + return { fieldtype: "Select", label: __("Fetch From"), options }; }); let field_df = computedAsync(async () => { let options = [{ label: __("Select Field"), value: "" }]; - let df = { fieldtype: "Select", label: __("Fetch Form"), options }; + let df = { fieldtype: "Select", label: __("Fetch From"), options }; if (!doctype.value) return df; let doctype_name = doctypes.value?.find(df => df.value == doctype.value).doctype_name; if (!doctype_name) return df; From 9d157685368bff5c0c5929932c79ca11dafa16e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 16:46:26 +0530 Subject: [PATCH 3/5] build(deps): bump semver from 5.7.1 to 5.7.2 (#21640) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index ec9dd19dc9..0af7bcad5b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3027,14 +3027,14 @@ sax@^1.2.4, sax@~1.2.4: integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== + version "5.7.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" + integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== + version "6.3.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" + integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== set-getter@^0.1.0: version "0.1.1" From 84c5e556bf7bcd49a99aeb4493002d18021f7693 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 11 Jul 2023 17:17:27 +0530 Subject: [PATCH 4/5] fix: removed the output field from the console log (#21600) --- frappe/desk/doctype/console_log/console_log.json | 13 ++++--------- .../desk/doctype/system_console/system_console.py | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/frappe/desk/doctype/console_log/console_log.json b/frappe/desk/doctype/console_log/console_log.json index a9ae9717fd..b8ccf8c9b5 100644 --- a/frappe/desk/doctype/console_log/console_log.json +++ b/frappe/desk/doctype/console_log/console_log.json @@ -6,8 +6,7 @@ "editable_grid": 1, "engine": "InnoDB", "field_order": [ - "script", - "output" + "script" ], "fields": [ { @@ -16,20 +15,15 @@ "in_list_view": 1, "label": "Script", "read_only": 1 - }, - { - "fieldname": "output", - "fieldtype": "Code", - "label": "Output", - "read_only": 1 } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2020-08-18 20:07:57.587344", + "modified": "2023-07-05 22:16:02.823955", "modified_by": "Administrator", "module": "Desk", "name": "Console Log", + "naming_rule": "Expression", "owner": "Administrator", "permissions": [ { @@ -48,5 +42,6 @@ "quick_entry": 1, "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } \ No newline at end of file diff --git a/frappe/desk/doctype/system_console/system_console.py b/frappe/desk/doctype/system_console/system_console.py index 993af6e753..b79fd515b8 100644 --- a/frappe/desk/doctype/system_console/system_console.py +++ b/frappe/desk/doctype/system_console/system_console.py @@ -26,7 +26,7 @@ class SystemConsole(Document): else: frappe.db.rollback() - frappe.get_doc(dict(doctype="Console Log", script=self.console, output=self.output)).insert() + frappe.get_doc(dict(doctype="Console Log", script=self.console)).insert() frappe.db.commit() From ec5abcb3f501a73373c1a943fe2ea9c4cb931021 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Tue, 11 Jul 2023 18:08:09 +0530 Subject: [PATCH 5/5] fix: populate form tour fields closes https://github.com/frappe/frappe/issues/21455 --- frappe/desk/doctype/form_tour/form_tour.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/desk/doctype/form_tour/form_tour.js b/frappe/desk/doctype/form_tour/form_tour.js index 390f519367..068457c2c6 100644 --- a/frappe/desk/doctype/form_tour/form_tour.js +++ b/frappe/desk/doctype/form_tour/form_tour.js @@ -9,6 +9,7 @@ frappe.ui.form.on("Form Tour", { frm.set_query("reference_doctype", () => { return { filters: { istable: 0 } }; }); + frm.trigger("reference_doctype"); frm.set_query("report_name", () => { if (frm.doc.reference_doctype) { return {