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

Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Maria Sukhova 2022-06-02 17:45:43 +03:00
commit ab9b73d4e5
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
View File

@ -179,6 +179,8 @@ const OperationsPanelComponent = (props) => {
? t("Translations:CopyHere")
: t("Translations:MoveHere")
}
isRecycleBin={isRecycleBin}
currentFolderId={currentFolderId}
></SelectFolderDialog>
);
};

10
products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
View File

@ -196,6 +196,8 @@ class SelectFolderDialog extends React.Component {
folderTitle,
expandedKeys,
isDisableButton,
isRecycleBin,
currentFolderId,
} = this.props;
const {
displayType,
@ -234,7 +236,9 @@ class SelectFolderDialog extends React.Component {
}
isAvailable={isAvailable}
isDisableTree={isDisableTree}
isDisableButton={isDisableButton}
isDisableButton={
isDisableButton || (isRecycleBin && currentFolderId === folderId)
}
/>
) : (
<SelectionPanel
@ -258,7 +262,9 @@ class SelectFolderDialog extends React.Component {
isDisableTree={isDisableTree}
folderSelection
newFilter={this.newFilter}
isDisableButton={isDisableButton}
isDisableButton={
isDisableButton || (isRecycleBin && currentFolderId === folderId)
}
/>
);
}