IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
View File

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

5
packages/client/src/pages/Home/Section/Body/TableView/TableHeader.js
View File

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