Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

This commit is contained in:
Timofey Boyko 2024-03-18 17:37:40 +03:00
commit a8f3d44487
2 changed files with 2 additions and 4 deletions

View File

@ -234,6 +234,7 @@ const Table = ({
setHideColumns={setHideColumns}
navigate={navigate}
location={location}
isRooms={isRooms}
/>
<TableBody

View File

@ -614,9 +614,7 @@ export default inject(
roomsFilter,
setRoomsFilter,
} = filesStore;
const { isRecentTab, isRoomsFolder, isArchiveFolder, isTrashFolder } =
treeFoldersStore;
const isRooms = isRoomsFolder || isArchiveFolder;
const { isRecentTab, isArchiveFolder, isTrashFolder } = treeFoldersStore;
const withContent = canShare;
const sortingVisible = true;
const { withPaging, isFrame, frameConfig } = settingsStore;
@ -702,7 +700,6 @@ export default inject(
getColumns,
setColumnEnable,
isRooms,
isTrashFolder,
isPublicRoom,
publicRoomKey,