Merge branch 'develop' into refactor-re

This commit is contained in:
gavin 2022-06-08 14:42:24 +05:30 committed by GitHub
commit 0649d7ce19
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -8,7 +8,7 @@ frappe.pages['print'].on_page_load = function(wrapper) {
$(wrapper).bind('show', () => {
const route = frappe.get_route();
const doctype = route[1];
const docname = route[2];
const docname = route.slice(2).join("/");
if (!frappe.route_options || !frappe.route_options.frm) {
frappe.model.with_doc(doctype, docname, () => {
let frm = { doctype: doctype, docname: docname };

View file

@ -150,7 +150,7 @@ frappe.breadcrumbs = {
set_form_breadcrumb(breadcrumbs, view) {
const doctype = breadcrumbs.doctype;
const docname = frappe.get_route()[2];
const docname = frappe.get_route().slice(2).join("/");
let form_route = `/app/${frappe.router.slug(doctype)}/${docname}`;
$(`<li><a href="${form_route}">${__(docname)}</a></li>`)
.appendTo(this.$breadcrumbs);