From 121ae7e36b03ec33b95c9a0b5ee6aa8200e6485e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 7 Jul 2021 17:58:45 +0530 Subject: [PATCH] fix: Allow to open folders that are nested inside 2 folders --- frappe/public/js/frappe/router.js | 8 ++++---- frappe/public/js/frappe/views/file/file_view.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 12caf4ab94..2bfa7c7be6 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -171,8 +171,8 @@ frappe.router = { } else { standard_route = ['List', doctype_route.doctype, frappe.utils.to_title_case(route[2])]; if (route[3]) { - // calendar / kanban / dashboard name - standard_route.push(route[3]); + // calendar / kanban / dashboard / folder name + standard_route.push(...route.splice(3, route.length)); } } return standard_route; @@ -297,8 +297,8 @@ frappe.router = { if (route[2] && route[2] !== 'list' && !$.isPlainObject(route[2])) { new_route = [this.slug(route[1]), 'view', route[2].toLowerCase()]; - // calendar / inbox - if (route[3]) new_route.push(route[3]); + // calendar / inbox / file folder + if (route[3]) new_route.push(...route.slice(3, route.length)); } else { if ($.isPlainObject(route[2])) { frappe.route_options = route[2]; diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js index 6f0cdcc0f1..e020bff4dd 100644 --- a/frappe/public/js/frappe/views/file/file_view.js +++ b/frappe/public/js/frappe/views/file/file_view.js @@ -315,7 +315,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { acc += "/" + curr; } return acc; - }, "/app/file"); + }, "/app/file/view"); return `${folder}`; })