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

if ForceSaveTimeout exists always send event to client

Browse Source
This commit is contained in:
konovalovsergey
2017-02-15 19:42:26 +03:00
parent f93c2d0193
commit f46b2a8a1d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
DocService/sources/DocsCoServer.js
View File

@ -667,8 +667,7 @@ function* setForceSave(docId, forceSave, cmd, success) {
yield utils.promiseRedis(redisClient, redisClient.hset, redisKeyForceSave + docId, forceSaveIndex, true);
let forceSaveType = forceSave.getType();
if ((commonDefines.c_oAscForceSaveTypes.Button === forceSaveType ||
commonDefines.c_oAscForceSaveTypes.Timeout === forceSaveType)) {
if (cfgForceSaveTimeout > 0 || commonDefines.c_oAscForceSaveTypes.Button === forceSaveType) {
yield* publish({
type: commonDefines.c_oPublishType.forceSave, docId: docId,
data: {type: forceSaveType, time: forceSave.getTime()}
@ -1938,8 +1937,11 @@ exports.install = function(server, callbackFunction) {
lastForceSaveTime = -1;
//todo multi with messages
let lastSave = yield* getLastSave(docId);
if (lastSave && lastSave.end) {
lastForceSaveTime = lastSave.time;
if (lastSave) {
let notModified = yield* getLastForceSave(docId, lastSave);
if (notModified) {
lastForceSaveTime = lastSave.time;
}
}
}
var sendObject = {