From 6c7ea6afe2a657a15417d6bb7f112e495b0827d3 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 28 Oct 2016 16:19:03 +0300
Subject: [PATCH 1/3] [DE] Changed format for data in setHistoryData.

---
 apps/common/main/lib/controller/History.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index b7a5b39df1..6618b7ad19 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -163,19 +163,32 @@ define([
                 if (historyStore && data!==null) {
                     var rev, revisions = historyStore.findRevisions(data.version),
                         urlGetTime = new Date();
-                    var diff = opts.data.urlDiff || opts.data.changesUrl;
+                    var diff = opts.data.urlDiff || opts.data.changesUrl,
+                        url, docId;
+                    if (opts.data.current && opts.data.previous) {
+                        url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url;
+                        docId = _.isEmpty(diff) ? opts.data.current.key : opts.data.previous.key;
+                    } else {
+                        url = opts.data.url;
+                        docId = _.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev;
+                    }
+
                     if (revisions && revisions.length>0) {
                         for(var i=0; i<revisions.length; i++) {
                             rev = revisions[i];
-                            rev.set('url', opts.data.url, {silent: true});
+                            rev.set('url', url, {silent: true});
                             rev.set('urlDiff', diff, {silent: true});
                             rev.set('urlGetTime', urlGetTime, {silent: true});
+                            if (opts.data.current && opts.data.previous) {
+                                rev.set('docId', opts.data.current.key, {silent: true});
+                                rev.set('docIdPrev', opts.data.previous.key, {silent: true});
+                            }
                         }
                     }
                     var hist = new Asc.asc_CVersionHistory();
-                    hist.asc_setUrl(opts.data.url);
+                    hist.asc_setUrl(url);
                     hist.asc_setUrlChanges(diff);
-                    hist.asc_setDocId(_.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev);
+                    hist.asc_setDocId(docId);
                     hist.asc_setCurrentChangeId(this.currentChangeId);
                     hist.asc_setArrColors(this.currentArrColors);
                     this.api.asc_showRevision(hist);

From 0c251ec008559239d2245d0cdf87e0f9e8ac0416 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 28 Oct 2016 17:40:53 +0300
Subject: [PATCH 2/3] [DE] Delete unused field opts.data.urlDiff in
 SetHistoryData.

---
 apps/common/main/lib/controller/History.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index 6618b7ad19..f01eb8f7ed 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -163,7 +163,7 @@ define([
                 if (historyStore && data!==null) {
                     var rev, revisions = historyStore.findRevisions(data.version),
                         urlGetTime = new Date();
-                    var diff = opts.data.urlDiff || opts.data.changesUrl,
+                    var diff = opts.data.changesUrl,
                         url, docId;
                     if (opts.data.current && opts.data.previous) {
                         url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url;

From 8b90eb49259d296a2d23187a0c0c9ae7caac0a04 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Mon, 31 Oct 2016 15:01:45 +0300
Subject: [PATCH 3/3] [DE] Changed format for data in setHistoryData (+ support
 for old format). {   version: '...',   url: '...',   key: '...',  
 changesUrl: '...',   previous: {     url: '...',     key: '...',   } }

---
 apps/common/main/lib/controller/History.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index f01eb8f7ed..18640494f3 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -164,14 +164,9 @@ define([
                     var rev, revisions = historyStore.findRevisions(data.version),
                         urlGetTime = new Date();
                     var diff = opts.data.changesUrl,
-                        url, docId;
-                    if (opts.data.current && opts.data.previous) {
-                        url = _.isEmpty(diff) ? opts.data.current.url : opts.data.previous.url;
-                        docId = _.isEmpty(diff) ? opts.data.current.key : opts.data.previous.key;
-                    } else {
-                        url = opts.data.url;
-                        docId = _.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev;
-                    }
+                        url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url,
+                        docId = opts.data.key ? opts.data.key : this.currentDocId,
+                        docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev;
 
                     if (revisions && revisions.length>0) {
                         for(var i=0; i<revisions.length; i++) {
@@ -179,16 +174,16 @@ define([
                             rev.set('url', url, {silent: true});
                             rev.set('urlDiff', diff, {silent: true});
                             rev.set('urlGetTime', urlGetTime, {silent: true});
-                            if (opts.data.current && opts.data.previous) {
-                                rev.set('docId', opts.data.current.key, {silent: true});
-                                rev.set('docIdPrev', opts.data.previous.key, {silent: true});
+                            if (opts.data.key) {
+                                rev.set('docId', docId, {silent: true});
+                                rev.set('docIdPrev', docIdPrev, {silent: true});
                             }
                         }
                     }
                     var hist = new Asc.asc_CVersionHistory();
                     hist.asc_setUrl(url);
                     hist.asc_setUrlChanges(diff);
-                    hist.asc_setDocId(docId);
+                    hist.asc_setDocId(_.isEmpty(diff) ? docId : docIdPrev);
                     hist.asc_setCurrentChangeId(this.currentChangeId);
                     hist.asc_setArrColors(this.currentArrColors);
                     this.api.asc_showRevision(hist);