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

Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1

Browse Source
This commit is contained in:
Tatiana Lopaeva 2021-11-24 14:13:12 +03:00
commit 15c74df725
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/install/OneClickInstall/install-Debian/install-preq.sh
View File

@ -61,7 +61,7 @@ if [ "$(ls -A "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
adduser --quiet --home ${PRODUCT_DIR}/services/kafka --system kafka
fi
cd ${PRODUCT_DIR}/services/kafka
curl https://downloads.apache.org/kafka/2.7.1/kafka_2.13-2.7.1.tgz -O
curl https://downloads.apache.org/kafka/2.7.2/kafka_2.13-2.7.2.tgz -O
tar xzf kafka_*.tgz --strip 1 && rm -rf kafka_*.tgz
chown -R kafka ${PRODUCT_DIR}/services/kafka
cd -

2
build/install/OneClickInstall/install-RedHat/install-preq.sh
View File

@ -104,7 +104,7 @@ if [ "$(ls -A "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
mkdir -p ${PRODUCT_DIR}/services/
getent passwd kafka >/dev/null || useradd -m -d ${PRODUCT_DIR}/services/kafka -s /sbin/nologin -p kafka kafka
cd ${PRODUCT_DIR}/services/kafka
curl https://downloads.apache.org/kafka/2.7.1/kafka_2.13-2.7.1.tgz -O
curl https://downloads.apache.org/kafka/2.7.2/kafka_2.13-2.7.2.tgz -O
tar xzf kafka_*.tgz --strip 1 && rm -rf kafka_*.tgz
chown -R kafka ${PRODUCT_DIR}/services/kafka
cd -

18
products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
View File

@ -37,6 +37,16 @@ const ConflictResolveDialog = (props) => {
const onSelectResolveType = (e) => setResolveType(e.target.value);
const onClose = () => setConflictResolveDialogVisible(false);
const onCloseDialog = () => {
let newActiveFiles = activeFiles;
for (let item of fileIds) {
newActiveFiles = newActiveFiles.filter((f) => f !== item);
}
setActiveFiles(newActiveFiles);
onClose();
};
const getResolveType = () => {
switch (resolveType) {
@ -59,8 +69,8 @@ const ConflictResolveDialog = (props) => {
let newActiveFiles = activeFiles;
if (conflictResolveType === ConflictResolveType.Skip) {
for (let item of items) {
newFileIds = newFileIds.filter((x) => x.id === item.id);
newActiveFiles = newActiveFiles.filter((f) => f === item.id);
newFileIds = newFileIds.filter((x) => x !== item.id);
newActiveFiles = newActiveFiles.filter((f) => f !== item.id);
}
}
@ -124,7 +134,7 @@ const ConflictResolveDialog = (props) => {
<ModalDialogContainer
isLoading={!tReady}
visible={visible}
onClose={onClose}
onClose={onCloseDialog}
>
<ModalDialog.Header>{t("ConflictResolveTitle")}</ModalDialog.Header>
<ModalDialog.Body>
@ -165,7 +175,7 @@ const ConflictResolveDialog = (props) => {
key="CancelButton"
label={t("Common:CancelButton")}
size="medium"
onClick={onClose}
onClick={onCloseDialog}
//isLoading={isLoading}
/>
</ModalDialog.Footer>