Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1
This commit is contained in:
commit
fb68cefffe
@ -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();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user