From faa1d536a292c089e5974b307ed40f62c62de2cb Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 17 Feb 2017 16:05:23 +0300
Subject: [PATCH] [DE] Set token for history version.

---
 apps/common/main/lib/controller/History.js   | 7 ++++++-
 apps/common/main/lib/model/HistoryVersion.js | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js
index fb0c5adab..e5e2f815a 100644
--- a/apps/common/main/lib/controller/History.js
+++ b/apps/common/main/lib/controller/History.js
@@ -134,12 +134,14 @@ define([
                  }, 10);
             } else {
                 var urlDiff = record.get('urlDiff'),
+                    token   = record.get('token'),
                     hist = new Asc.asc_CVersionHistory();
                 hist.asc_setDocId(_.isEmpty(urlDiff) ? this.currentDocId : this.currentDocIdPrev);
                 hist.asc_setUrl(url);
                 hist.asc_setUrlChanges(urlDiff);
                 hist.asc_setCurrentChangeId(this.currentChangeId);
                 hist.asc_setArrColors(this.currentArrColors);
+                hist.asc_setToken(token);
                 this.api.asc_showRevision(hist);
 
                 var commentsController = this.getApplication().getController('Common.Controllers.Comments');
@@ -166,7 +168,8 @@ define([
                     var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes
                         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;
+                        docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev,
+                        token = opts.data.token;
 
                     if (revisions && revisions.length>0) {
                         for(var i=0; i<revisions.length; i++) {
@@ -178,6 +181,7 @@ define([
                                 rev.set('docId', docId, {silent: true});
                                 rev.set('docIdPrev', docIdPrev, {silent: true});
                             }
+                            rev.set('token', token, {silent: true});
                         }
                     }
                     var hist = new Asc.asc_CVersionHistory();
@@ -186,6 +190,7 @@ define([
                     hist.asc_setDocId(_.isEmpty(diff) ? docId : docIdPrev);
                     hist.asc_setCurrentChangeId(this.currentChangeId);
                     hist.asc_setArrColors(this.currentArrColors);
+                    hist.asc_setToken(token);
                     this.api.asc_showRevision(hist);
 
                     var commentsController = this.getApplication().getController('Common.Controllers.Comments');
diff --git a/apps/common/main/lib/model/HistoryVersion.js b/apps/common/main/lib/model/HistoryVersion.js
index 1ec372cf2..10fe1f9fe 100644
--- a/apps/common/main/lib/model/HistoryVersion.js
+++ b/apps/common/main/lib/model/HistoryVersion.js
@@ -64,6 +64,7 @@ define([
                 urlGetTime : '',
                 docId: '',
                 docIdPrev: '',
+                token: '',
                 arrColors: [], // array of user colors for all changes of current version
                 markedAsVersion: false,
                 canRestore: false,