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

Merge pull request #20 from ONLYOFFICE/release/v4.1.0

Browse source 
Fix Bug 33031.
This commit is contained in:
Julia Radzhabova 2016-08-30 10:03:15 +03:00 committed by GitHub
parent 1fbebd0d9e 20a70db963
commit d7b05c7ada
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -733,7 +733,9 @@ define([
}, },
onEditorPermissions: function(params) { onEditorPermissions: function(params) {
var licType = params.asc_getLicenseType(); var licType = params ? params.asc_getLicenseType() : Asc.c_oLicenseResult.Error;
if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) {
if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) { if (Asc.c_oLicenseResult.Expired === licType || Asc.c_oLicenseResult.Error === licType) {
Common.UI.warning({ Common.UI.warning({
title: this.titleLicenseExp, title: this.titleLicenseExp,
@ -744,7 +746,6 @@ define([
return; return;
} }
if ( params && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge)) {
this.appOptions.canAutosave = true; this.appOptions.canAutosave = true;
this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable();