vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: separate internal_and_external_links from internal_links

Browse source
This commit is contained in:
anandbaburajan 2023-09-05 21:41:43 +05:30
parent fbbdef1e9c
commit 1dc7a3705b
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/desk/notifications.py
View file

@ -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"]:

1
frappe/public/js/frappe/form/dashboard.js
View file

@ -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();
}

4
frappe/tests/test_dashboard_connections.py
View file

@ -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