From 037621732991da2791ad0fcd5bab99f5dd2e0b08 Mon Sep 17 00:00:00 2001
From: konovalovsergey <Sergey.Konovalov@onlyoffice.com>
Date: Tue, 28 Apr 2020 12:03:16 +0300
Subject: [PATCH] [bug] Fix forcesave button behavior in co-editing mode

---
 DocService/sources/DocsCoServer.js            | 8 ++++++++
 DocService/sources/postgreSqlBaseConnector.js | 1 +
 2 files changed, 9 insertions(+)

diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
index 13b68d4f..47c334f2 100644
--- a/DocService/sources/DocsCoServer.js
+++ b/DocService/sources/DocsCoServer.js
@@ -2405,6 +2405,10 @@ exports.install = function(server, callbackFunction) {
         let changesToSend = arrNewDocumentChanges;
         if(changesToSend.length > cfgPubSubMaxChanges) {
           changesToSend = null;
+        } else {
+          changesToSend.forEach((value) => {
+            value.time = value.time.getTime();
+          })
         }
         yield* publish({type: commonDefines.c_oPublishType.changes, docId: docId, userId: userId,
           changes: changesToSend, startIndex: startIndex, changesIndex: puckerIndex,
@@ -2424,6 +2428,10 @@ exports.install = function(server, callbackFunction) {
       let changesToSend = arrNewDocumentChanges;
       if(changesToSend.length > cfgPubSubMaxChanges) {
         changesToSend = null;
+      } else {
+        changesToSend.forEach((value) => {
+          value.time = value.time.getTime();
+        })
       }
       let isPublished = yield* publish({type: commonDefines.c_oPublishType.changes, docId: docId, userId: userId,
         changes: changesToSend, startIndex: startIndex, changesIndex: puckerIndex,
diff --git a/DocService/sources/postgreSqlBaseConnector.js b/DocService/sources/postgreSqlBaseConnector.js
index 8866b7ab..d8f51c17 100644
--- a/DocService/sources/postgreSqlBaseConnector.js
+++ b/DocService/sources/postgreSqlBaseConnector.js
@@ -49,6 +49,7 @@ var pool = new pg.Pool({
   idleTimeoutMillis: 30000
 });
 //todo datetime timezone
+pg.defaults.parseInputDatesAsUTC = true;
 types.setTypeParser(1114, function(stringValue) {
   return new Date(stringValue + '+0000');
 });