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

[DE] Check build versions for editor and revisions in versions history.

Browse source
This commit is contained in:
Julia Radzhabova 2016-10-05 17:08:53 +03:00
parent f9613e3a3c
commit 7e1f1ebc5b
1 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/Main.js
View file

@ -421,8 +421,9 @@ define([
var changes = version.changes, change, i; var changes = version.changes, change, i;
if (changes && changes.length>0) { if (changes && changes.length>0) {
arrVersions[arrVersions.length-1].set('changeid', changes.length-1);
arrVersions[arrVersions.length-1].set('docIdPrev', docIdPrev); arrVersions[arrVersions.length-1].set('docIdPrev', docIdPrev);
if (version.buildVersion && version.buildVersion == this.appOptions.buildVersion) {
arrVersions[arrVersions.length-1].set('changeid', changes.length-1);
arrVersions[arrVersions.length-1].set('hasChanges', changes.length>1); arrVersions[arrVersions.length-1].set('hasChanges', changes.length>1);
for (i=changes.length-2; i>=0; i--) { for (i=changes.length-2; i>=0; i--) {
change = changes[i]; change = changes[i];
@ -455,6 +456,7 @@ define([
})); }));
arrColors.push(user.get('colorval')); arrColors.push(user.get('colorval'));
} }
}
} else if (ver==0 && versions.length==1) { } else if (ver==0 && versions.length==1) {
arrVersions[arrVersions.length-1].set('docId', version.key + '1'); arrVersions[arrVersions.length-1].set('docId', version.key + '1');
} }
@ -972,6 +974,7 @@ define([
this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit; this.appOptions.canEditStyles = this.appOptions.canLicense && this.appOptions.canEdit;
this.appOptions.canPrint = (this.permissions.print !== false); this.appOptions.canPrint = (this.permissions.print !== false);
this.appOptions.canRename = !!this.permissions.rename; this.appOptions.canRename = !!this.permissions.rename;
this.appOptions.buildVersion = params.asc_getBuildVersion();
var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType); var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
this.appOptions.canDownloadOrigin = !this.appOptions.nativeApp && this.permissions.download !== false && (type && typeof type[1] === 'string'); this.appOptions.canDownloadOrigin = !this.appOptions.nativeApp && this.permissions.download !== false && (type && typeof type[1] === 'string');