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

Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

Browse Source
This commit is contained in:
Timofey Boyko 2024-08-27 17:11:32 +03:00
commit fb68cefffe
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/client/src/store/FilesActionsStore.js
View File

@ -2538,7 +2538,9 @@ class FilesActionStore {
const urlFilter = getObjectByLocation(window.DocSpace.location);
const isArchivedRoom = !!(CategoryType.Archive && urlFilter?.folder);
const isArchivedRoom = !!(
CategoryType.Trash !== categoryType && urlFilter?.folder
);
if (this.publicRoomStore.isPublicRoom) {
return this.backToParentFolder();
@ -2559,10 +2561,11 @@ class FilesActionStore {
return this.moveToRoomsPage();
}
if (
categoryType === CategoryType.Personal ||
categoryType === CategoryType.Trash
) {
if (categoryType === CategoryType.Trash) {
return;
}
if (categoryType === CategoryType.Personal) {
return this.backToParentFolder();
}