Browse Source

fix(Workspace): broken links for reports created with Report Builder

version-14
Sagar Vora 4 years ago
parent
commit
c1e0930e16
2 changed files with 14 additions and 6 deletions
  1. +5
    -3
      frappe/public/js/frappe/utils/utils.js
  2. +9
    -3
      frappe/public/js/frappe/widgets/links_widget.js

+ 5
- 3
frappe/public/js/frappe/utils/utils.js View File

@@ -1197,10 +1197,12 @@ Object.assign(frappe.utils, {
route = "";
}
}
} else if (type === "report" && item.is_query_report) {
route = "query-report/" + item.name;
} else if (type === "report") {
route = frappe.router.slug(item.name) + "/view/report";
if (item.is_query_report) {
route = "query-report/" + item.name;
} else {
route = frappe.router.slug(item.doctype) + "/view/report/" + item.name;
}
} else if (type === "page") {
route = item.name;
} else if (type === "dashboard") {


+ 9
- 3
frappe/public/js/frappe/widgets/links_widget.js View File

@@ -61,11 +61,17 @@ export default class LinksWidget extends Widget {
};

this.link_list = this.links.map(item => {
const route = frappe.utils.generate_route({
const opts = {
name: item.link_to,
type: item.link_type,
is_query_report: item.is_query_report
});
}

if (item.link_type == "Report" && !item.is_query_report) {
opts.doctype = item.dependencies;
}

const route = frappe.utils.generate_route(opts);

return $(`<a href="${route}" class="link-item ellipsis ${
item.onboard ? "onboard-spotlight" : ""
@@ -103,4 +109,4 @@ export default class LinksWidget extends Widget {
}
});
}
}
}

Loading…
Cancel
Save