Merge branch 'bugfix/v0.1.6' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.6
This commit is contained in:
commit
176fa7464f
@ -111,6 +111,8 @@ const SimpleFilesRow = createSelectable((props) => {
|
||||
setTooltipPosition,
|
||||
setDownloadDialogVisible,
|
||||
downloadAction,
|
||||
confirmDelete,
|
||||
setDeleteDialogVisible,
|
||||
} = props;
|
||||
|
||||
const {
|
||||
@ -270,6 +272,9 @@ const SimpleFilesRow = createSelectable((props) => {
|
||||
return;
|
||||
}
|
||||
|
||||
if (confirmDelete) {
|
||||
setDeleteDialogVisible(true);
|
||||
} else {
|
||||
const translations = {
|
||||
deleteOperation: t("DeleteOperation"),
|
||||
};
|
||||
@ -281,6 +286,7 @@ const SimpleFilesRow = createSelectable((props) => {
|
||||
: deleteFolderAction(id, parentId, translations)
|
||||
.then(() => toastr.success(t("FolderRemoved")))
|
||||
.catch((err) => toastr.error(err));
|
||||
}
|
||||
};
|
||||
|
||||
const rowContextClick = () => {
|
||||
@ -599,6 +605,7 @@ export default inject(
|
||||
filesActionsStore,
|
||||
mediaViewerDataStore,
|
||||
uploadDataStore,
|
||||
settingsStore,
|
||||
},
|
||||
{ item }
|
||||
) => {
|
||||
@ -614,6 +621,7 @@ export default inject(
|
||||
setMoveToPanelVisible,
|
||||
setCopyPanelVisible,
|
||||
setDownloadDialogVisible,
|
||||
setDeleteDialogVisible,
|
||||
} = dialogsStore;
|
||||
|
||||
const {
|
||||
@ -705,6 +713,8 @@ export default inject(
|
||||
onSelectItem,
|
||||
setTooltipPosition,
|
||||
downloadAction,
|
||||
confirmDelete: settingsStore.confirmDelete,
|
||||
setDeleteDialogVisible,
|
||||
};
|
||||
}
|
||||
)(withTranslation("Home")(observer(withRouter(SimpleFilesRow))));
|
||||
|
@ -200,7 +200,7 @@ class NewFilesPanel extends React.Component {
|
||||
return (
|
||||
<Row key={file.id} element={element}>
|
||||
<Box
|
||||
onClick={this.onNewFilesClick.bind(this, file)}
|
||||
onClick={this.onNewFileClick.bind(this, file)}
|
||||
marginProp="auto 0"
|
||||
>
|
||||
<Link
|
||||
@ -267,7 +267,9 @@ export default inject(
|
||||
setIsLoading,
|
||||
isLoading,
|
||||
updateFileBadge,
|
||||
updateFilesBadge,
|
||||
updateFolderBadge,
|
||||
updateFoldersBadge,
|
||||
} = filesStore;
|
||||
const { updateRootBadge } = treeFoldersStore;
|
||||
const { setMediaViewerData } = mediaViewerDataStore;
|
||||
|
Loading…
Reference in New Issue
Block a user