From 27e6b1f41485b7179a5672a5bad7b08e65eecf0b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Feb 2022 13:19:33 +0300 Subject: [PATCH 1/2] Fix Bug 55678 --- apps/api/documents/api.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index f7e0189e8..d2d9ead97 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -932,14 +932,17 @@ if (config.editorConfig.customization.loaderName !== 'none') params += "&customer=" + encodeURIComponent(config.editorConfig.customization.loaderName); } else params += "&customer={{APP_CUSTOMER_NAME}}"; - if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) { - if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo); - } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) { - if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded)) - params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded); - else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) { - config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image)); - config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark)); + if (typeof(config.editorConfig.customization) == 'object') { + if ( config.editorConfig.customization.loaderLogo && config.editorConfig.customization.loaderLogo !== '') { + params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo); + } + if ( config.editorConfig.customization.logo ) { + if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded)) + params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded); + else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) { + config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image)); + config.editorConfig.customization.logo.imageDark && (params += "&headerlogodark=" + encodeURIComponent(config.editorConfig.customization.logo.imageDark)); + } } } } From 0e8b408303a94034bcfc0dae1428a9ee7a51a898 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Feb 2022 13:24:16 +0300 Subject: [PATCH 2/2] Fix loader for fillForm mode in full editor (and fix open pdf files) --- apps/api/documents/api.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index d2d9ead97..f0f72168d 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -962,8 +962,6 @@ if (config.editorConfig && config.editorConfig.customization && (config.editorConfig.customization.toolbar===false)) params += "&toolbar=false"; - else if (config.document && config.document.permissions && (config.document.permissions.edit === false && config.document.permissions.fillForms )) - params += "&toolbar=true"; if (config.parentOrigin) params += "&parentOrigin=" + config.parentOrigin;