Merge pull request frappe#26736 from Nihantra-Patel/fix_workspace_rep…

…ort_builder_v15 fix: redirect report builder from workspace
ruthra-kumar · Jul 27, 2024 · 801d1a0 · 801d1a0
2 parents 968800c + 017b89e
commit 801d1a0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py
@@ -80,6 +80,10 @@ def validate(self):
 		except Exception:
 			frappe.throw(_("Content data shoud be a list"))
 
+		for d in self.get("links"):
+			if d.link_type == "Report" and d.is_query_report != 1:
+				d.report_ref_doctype = frappe.get_value("Report", d.link_to, "ref_doctype")
+
 	def clear_cache(self):
 		super().clear_cache()
 		if self.for_user:

diff --git a/frappe/desk/doctype/workspace_link/workspace_link.json b/frappe/desk/doctype/workspace_link/workspace_link.json
@@ -13,6 +13,7 @@
   "link_details_section",
   "link_type",
   "link_to",
+  "report_ref_doctype",
   "column_break_7",
   "dependencies",
   "only_for",
@@ -116,12 +117,19 @@
    "ignore_xss_filter": 1,
    "label": "Description",
    "max_height": "7rem"
+  },
+  {
+   "fieldname": "report_ref_doctype",
+   "fieldtype": "Link",
+   "label": "Report Ref DocType",
+   "options": "DocType",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-23 16:04:06.025772",
+ "modified": "2024-06-10 16:04:00.746903",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Workspace Link",

diff --git a/frappe/desk/doctype/workspace_link/workspace_link.py b/frappe/desk/doctype/workspace_link/workspace_link.py
@@ -28,6 +28,7 @@ class WorkspaceLink(Document):
 		parent: DF.Data
 		parentfield: DF.Data
 		parenttype: DF.Data
+		report_ref_doctype: DF.Link | None
 		type: DF.Literal["Link", "Card Break"]
 	# end: auto-generated types
 

diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js
@@ -1299,10 +1299,11 @@ Object.assign(frappe.utils, {
 			} else if (type === "report") {
 				if (item.is_query_report) {
 					route = "query-report/" + item.name;
-				} else if (!item.doctype) {
-					route = "report/" + item.name;
+				} else if (!item.is_query_report && item.report_ref_doctype) {
+					route =
+						frappe.router.slug(item.report_ref_doctype) + "/view/report/" + item.name;
 				} else {
-					route = frappe.router.slug(item.doctype) + "/view/report/" + item.name;
+					route = "/report/" + item.name;
 				}
 			} else if (type === "page") {
 				route = item.name;

diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js
@@ -92,6 +92,7 @@ export default class LinksWidget extends Widget {
 				type: item.link_type,
 				doctype: item.doctype,
 				is_query_report: item.is_query_report,
+				report_ref_doctype: item.report_ref_doctype,
 			};
 
 			if (item.link_type.toLowerCase() == "report" && !item.is_query_report) {