Web: Client: Apply changes by commits ea40ba3738
and 1b9dc04f30
after merge
This commit is contained in:
parent
d86fe1bc9d
commit
2e12a2e8ad
@ -350,6 +350,8 @@ const FilesSelector = ({
|
|||||||
setIsRequestRunning(false);
|
setIsRequestRunning(false);
|
||||||
clearActiveOperations(fileIds, folderIds);
|
clearActiveOperations(fileIds, folderIds);
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
toastr.error(t("Common:ErrorEmptyList"));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
setIsRequestRunning(true);
|
setIsRequestRunning(true);
|
||||||
@ -553,9 +555,11 @@ export default inject(
|
|||||||
isMove || isCopy || isRestoreAll
|
isMove || isCopy || isRestoreAll
|
||||||
? isRestoreAll
|
? isRestoreAll
|
||||||
? filesList
|
? filesList
|
||||||
: selection.length
|
: selection.length > 0 && selection[0] != null
|
||||||
? selection
|
? selection
|
||||||
: [bufferSelection]
|
: bufferSelection != null
|
||||||
|
? [bufferSelection]
|
||||||
|
: []
|
||||||
: [];
|
: [];
|
||||||
|
|
||||||
const selectionsWithoutEditing = isRestoreAll
|
const selectionsWithoutEditing = isRestoreAll
|
||||||
|
Loading…
Reference in New Issue
Block a user