From 830c0f420816bf98ee0fa5c49c336ad0a918c2e1 Mon Sep 17 00:00:00 2001 From: TimofeyBoyko Date: Tue, 19 Oct 2021 15:59:29 +0800 Subject: [PATCH] Web:Files:Catalog: fixed path parts for settings page --- products/ASC.Files/Client/src/components/Catalog/Body/Items.js | 2 +- products/ASC.Files/Server/DocStore | 2 +- products/ASC.People/Client/src/pages/Home/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/products/ASC.Files/Client/src/components/Catalog/Body/Items.js b/products/ASC.Files/Client/src/components/Catalog/Body/Items.js index 886ca70a61..50120dde8e 100644 --- a/products/ASC.Files/Client/src/components/Catalog/Body/Items.js +++ b/products/ASC.Files/Client/src/components/Catalog/Body/Items.js @@ -10,7 +10,7 @@ import Loaders from '@appserver/common/components/Loaders'; const Items = ({ data, showText, pathParts, selectedTreeNode, onClick, onBadgeClick }) => { const isActive = (item) => { if (selectedTreeNode.length > 0) { - if (pathParts.includes(item.id)) return true; + if (pathParts && pathParts.includes(item.id)) return true; if (selectedTreeNode[0] === '@my' && item.key === '0-0') return true; return `${item.id}` === selectedTreeNode[0]; } diff --git a/products/ASC.Files/Server/DocStore b/products/ASC.Files/Server/DocStore index b1063eae56..8177bad15d 160000 --- a/products/ASC.Files/Server/DocStore +++ b/products/ASC.Files/Server/DocStore @@ -1 +1 @@ -Subproject commit b1063eae56d183b5c0b6eb887115c378f3941ebe +Subproject commit 8177bad15d567d997a79478a65d32662a6f773b1 diff --git a/products/ASC.People/Client/src/pages/Home/index.js b/products/ASC.People/Client/src/pages/Home/index.js index 0ae738d0e4..df3bc5186e 100644 --- a/products/ASC.People/Client/src/pages/Home/index.js +++ b/products/ASC.People/Client/src/pages/Home/index.js @@ -38,7 +38,7 @@ const Home = ({ }) => { const { location } = history; const { pathname } = location; - console.log('People Home render'); + // console.log('People Home render'); useEffect(() => { if (pathname.indexOf('/people/filter') > -1) {