From 0ec41e9fabd3cced555fd0bd55332cf09ef82ce5 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Thu, 1 Aug 2019 13:04:02 +0530 Subject: [PATCH] fix: Add breadcrumbs in Pages (#8057) * fix: Add breadcrumbs in Pages * fix: Allow Report view in File --- frappe/public/js/frappe/views/file/file_view.js | 2 +- frappe/public/js/frappe/views/pageview.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js index fb01b87a61..6ee37aec3d 100644 --- a/frappe/public/js/frappe/views/file/file_view.js +++ b/frappe/public/js/frappe/views/file/file_view.js @@ -354,7 +354,7 @@ frappe.views.FileView.grid_view = frappe.get_user_settings('File').grid_view || function redirect_to_home_if_invalid_route() { const route = frappe.get_route(); - if (route[2] !== 'Home') { + if (route[2] === 'List') { // if the user somehow redirects to List/File/List // redirect back to Home frappe.set_route('List', 'File', 'Home'); diff --git a/frappe/public/js/frappe/views/pageview.js b/frappe/public/js/frappe/views/pageview.js index c31ba74285..c0149672cb 100644 --- a/frappe/public/js/frappe/views/pageview.js +++ b/frappe/public/js/frappe/views/pageview.js @@ -98,6 +98,9 @@ frappe.views.Page = Class.extend({ this.wrapper.innerHTML = this.pagedoc.content; frappe.dom.eval(this.pagedoc.__script || this.pagedoc.script || ''); frappe.dom.set_style(this.pagedoc.style || ''); + + // set breadcrumbs + frappe.breadcrumbs.add(this.pagedoc.module || null); } this.trigger_page_event('on_page_load');