From 1dc7a3705b46330c1d7f55bb5214affe8ee03ed6 Mon Sep 17 00:00:00 2001 From: anandbaburajan Date: Tue, 5 Sep 2023 21:41:43 +0530 Subject: [PATCH] fix: separate internal_and_external_links from internal_links --- frappe/desk/notifications.py | 4 +++- frappe/public/js/frappe/form/dashboard.js | 1 + frappe/tests/test_dashboard_connections.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/desk/notifications.py b/frappe/desk/notifications.py index 3ae0619aab..f0470566ac 100644 --- a/frappe/desk/notifications.py +++ b/frappe/desk/notifications.py @@ -270,7 +270,9 @@ def get_open_count(doctype, name, items=None): } for d in items: - internal_link_for_doctype = links.get("internal_links", {}).get(d) + internal_link_for_doctype = links.get("internal_links", {}).get(d) or links.get( + "internal_and_external_links", {} + ).get(d) if internal_link_for_doctype: internal_links_data_for_d = get_internal_links(doc, internal_link_for_doctype, d) if internal_links_data_for_d["count"]: diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index f80ee0897b..6efcdd3079 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -249,6 +249,7 @@ frappe.ui.form.Dashboard = class FormDashboard { this.data = this.frm.meta.__dashboard || {}; if (!this.data.transactions) this.data.transactions = []; if (!this.data.internal_links) this.data.internal_links = {}; + if (!this.data.internal_and_external_links) this.data.internal_and_external_links = {}; this.filter_permissions(); } diff --git a/frappe/tests/test_dashboard_connections.py b/frappe/tests/test_dashboard_connections.py index 3a3ec14b74..3be7184f6a 100644 --- a/frappe/tests/test_dashboard_connections.py +++ b/frappe/tests/test_dashboard_connections.py @@ -252,7 +252,7 @@ def get_dashboard_for_test_doctype_a_with_test_child_table_with_link_to_doctype_ data = { "fieldname": "test_doctype_a_with_test_child_table_with_link_to_doctype_b", - "internal_links": { + "internal_and_external_links": { "Test Doctype B With Child Table With Link To Doctype A": [ "child_table", "test_doctype_b_with_test_child_table_with_link_to_doctype_a", @@ -264,7 +264,7 @@ def get_dashboard_for_test_doctype_a_with_test_child_table_with_link_to_doctype_ } dashboard.fieldname = data["fieldname"] - dashboard.internal_links = data["internal_links"] + dashboard.internal_and_external_links = data["internal_and_external_links"] dashboard.transactions = data["transactions"] return dashboard