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

Merge pull request #21 from ONLYOFFICE/feature/bugfix

Browse source 
[PE] Bug with opening presenter view.
This commit is contained in:
Alexey Golubev 2017-10-23 16:05:38 +03:00 committed by GitHub
parent a80862e02c 4b83f6a2fd
commit 88d8ccf272
6 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/api.js
View file

@ -334,9 +334,6 @@
var type = /^(?:(pdf|djvu|xps))$/.exec(_config.document.fileType);
if (type && typeof type[1] === 'string') {
if (!_config.document.permissions)
_config.document.permissions = {};
_config.document.permissions.edit = _config.document.permissions.review = false;
_config.editorConfig.canUseHistory = false;
}

10
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -90,14 +90,20 @@ var ApplicationController = new(function(){
if (docConfig) {
permissions = $.extend(permissions, docConfig.permissions);
var docInfo = new Asc.asc_CDocInfo();
var _permissions = $.extend({}, docConfig.permissions),
docInfo = new Asc.asc_CDocInfo();
docInfo.put_Id(docConfig.key);
docInfo.put_Url(docConfig.url);
docInfo.put_Title(docConfig.title);
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(permissions);
docInfo.put_Permissions(_permissions);
var type = /^(?:(pdf|djvu|xps))$/.exec(docConfig.fileType);
if (type && typeof type[1] === 'string') {
permissions.edit = permissions.review = false;
}
if (api) {
api.asc_registerCallback('asc_onGetEditorPermissions', onEditorPermissions);

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

@ -305,7 +305,8 @@ define([
if (data.doc) {
this.permissions = $.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo();
var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname);
@ -319,9 +320,14 @@ define([
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions);
docInfo.put_Permissions(_permissions);
// docInfo.put_Review(this.permissions.review);
// docInfo.put_OfflineApp(this.editorConfig.nativeApp === true); // used in sdk for testing
var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
if (type && typeof type[1] === 'string') {
this.permissions.edit = this.permissions.review = false;
}
}
this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));

10
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -213,7 +213,8 @@ define([
if (data.doc) {
this.permissions = $.extend(this.permissions, data.doc.permissions);
var _user = new Asc.asc_CUserInfo();
var _permissions = $.extend({}, data.doc.permissions),
_user = new Asc.asc_CUserInfo();
_user.put_Id(this.appOptions.user.id);
_user.put_FullName(this.appOptions.user.fullname);
@ -227,7 +228,12 @@ define([
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(this.editorConfig.callbackUrl);
docInfo.put_Token(data.doc.token);
docInfo.put_Permissions(this.permissions);
docInfo.put_Permissions(_permissions);
var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType);
if (type && typeof type[1] === 'string') {
this.permissions.edit = this.permissions.review = false;
}
}
this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this));

2
apps/presentationeditor/main/app.reporter.js
View file

@ -107,7 +107,7 @@ require([
docInfo.put_VKey(data.vkey);
docInfo.put_Options(data.options);
docInfo.put_Token(data.token);
docInfo.put_Permissions( data.doc.permissions);
docInfo.put_Permissions( data.permissions);
}
api.preloadReporter(data);

2
apps/presentationeditor/main/app_dev.reporter.js
View file

@ -108,7 +108,7 @@ require([
docInfo.put_VKey(data.vkey);
docInfo.put_Options(data.options);
docInfo.put_Token(data.token);
docInfo.put_Permissions( data.doc.permissions);
docInfo.put_Permissions( data.permissions);
}
api.preloadReporter(data);