Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Versions History: изменено поле urlDiff на changesUrl.

Browse source
This commit is contained in:
Julia Radzhabova 2016-03-25 11:12:32 +03:00
parent 8b69324a44
commit 109908a17a
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/index.html
View file

@ -165,7 +165,8 @@
{
'version': revision.data,
'url': 'http://isa2',
'urlDiff': 'http://isa2'
'urlDiff': 'http://isa2',
'changesUrl': 'http://isa2'
}
);
}

7
apps/common/main/lib/controller/History.js
View file

@ -100,18 +100,19 @@ define([
if (historyStore && data!==null) {
var rev, revisions = historyStore.findRevisions(data.version),
urlGetTime = new Date();
var diff = opts.data.urlDiff || opts.data.changesUrl;
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('urlDiff', opts.data.urlDiff, {silent: true});
rev.set('urlDiff', diff, {silent: true});
rev.set('urlGetTime', urlGetTime, {silent: true});
}
}
var hist = new Asc.asc_CVersionHistory();
hist.asc_setUrl(opts.data.url);
hist.asc_setUrlChanges(opts.data.urlDiff);
hist.asc_setDocId(_.isEmpty(opts.data.urlDiff) ? this.currentDocId : this.currentDocIdPrev);
hist.asc_setUrlChanges(diff);
hist.asc_setDocId(_.isEmpty(diff) ? this.currentDocId : this.currentDocIdPrev);
hist.asc_setCurrentChangeId(this.currentChangeId);
hist.asc_setArrColors(this.currentArrColors);
this.api.asc_showRevision(hist);