pengjunjie/server
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/server.git synced 2026-04-07 14:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #437 from ONLYOFFICE/fix/bug64605

Browse Source 
[bug] Fix bug 64605
This commit is contained in:
Oleg Korshul
2023-10-12 13:47:56 +03:00
committed by GitHub
parent a87783a5e6 0705e054cb
commit c41f805e94
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DocService/sources/canvasservice.js
View File

@ -836,6 +836,7 @@ function* commandSaveFromOrigin(ctx, cmd, outputData, password) {
}
var queueData = getSaveTask(ctx, cmd);
queueData.setFromOrigin(true);
queueData.setFromChanges(true);
yield* docsCoServer.addTask(queueData, constants.QUEUE_PRIORITY_LOW);
}
outputData.setStatus('ok');

19
FileConverter/sources/converter.js
View File

@ -417,14 +417,17 @@ function* processDownloadFromStorage(ctx, dataConvert, cmd, task, tempDirs, auth
let concatDir;
let concatTemplate;
if (task.getFromOrigin() || task.getFromSettings()) {
let changesDir = path.join(tempDirs.source, constants.CHANGES_NAME);
fs.mkdirSync(changesDir);
let filesCount = yield* downloadFileFromStorage(ctx, cmd.getSaveKey(), changesDir);
if (filesCount > 0) {
concatDir = changesDir;
concatTemplate = "changes0";
dataConvert.fromChanges = true;
task.setFromChanges(dataConvert.fromChanges);
if (task.getFromChanges()) {
let changesDir = path.join(tempDirs.source, constants.CHANGES_NAME);
fs.mkdirSync(changesDir);
let filesCount = yield* downloadFileFromStorage(ctx, cmd.getSaveKey(), changesDir);
if (filesCount > 0) {
concatDir = changesDir;
concatTemplate = "changes0";
} else {
dataConvert.fromChanges = false;
task.setFromChanges(dataConvert.fromChanges);
}
}
dataConvert.fileFrom = path.join(tempDirs.source, 'origin.' + cmd.getFormat());
} else {