From c1b8e34f9e651bf34a002185e0a3e0590cfd5d9c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 26 Nov 2021 14:10:44 +0300 Subject: [PATCH] [Embedded][Forms] Fix Bug 54104 --- apps/documenteditor/embed/js/ApplicationController.js | 8 +++++++- apps/documenteditor/embed/locale/en.json | 1 + .../forms/app/controller/ApplicationController.js | 7 ++++++- apps/documenteditor/forms/locale/en.json | 1 + apps/presentationeditor/embed/js/ApplicationController.js | 8 +++++++- apps/presentationeditor/embed/locale/en.json | 1 + apps/spreadsheeteditor/embed/js/ApplicationController.js | 8 +++++++- apps/spreadsheeteditor/embed/locale/en.json | 1 + 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 86386b9f1..aa04adbbd 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -121,6 +121,7 @@ DE.ApplicationController = new(function(){ docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_UserInfo(_user); + docInfo.put_CallbackUrl(config.callbackUrl); docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); @@ -693,6 +694,10 @@ DE.ApplicationController = new(function(){ message = me.convertationErrorText; break; + case Asc.c_oAscError.ID.ConvertationOpenError: + message = me.openErrorText; + break; + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -945,6 +950,7 @@ DE.ApplicationController = new(function(){ txtEmpty: '(Empty)', txtPressLink: 'Press Ctrl and click link', errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.', - errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.' + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + openErrorText: 'An error has occurred while opening the file' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index 7053ca231..53426f88b 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -38,6 +38,7 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationController.openErrorText": "An error has occurred while opening the file.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtDownloadDocx": "Download as docx", "DE.ApplicationView.txtDownloadPdf": "Download as pdf", diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index a51611253..49481b289 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -189,6 +189,10 @@ define([ config.msg = this.convertationErrorText; break; + case Asc.c_oAscError.ID.ConvertationOpenError: + config.msg = this.openErrorText; + break; + case Asc.c_oAscError.ID.DownloadError: config.msg = this.downloadErrorText; break; @@ -1535,7 +1539,8 @@ define([ txtArt: 'Your text here', txtChoose: 'Choose an item', txtEnterDate: 'Enter a date', - txtClickToLoad: 'Click to load image' + txtClickToLoad: 'Click to load image', + openErrorText: 'An error has occurred while opening the file' }, DE.Controllers.ApplicationController)); diff --git a/apps/documenteditor/forms/locale/en.json b/apps/documenteditor/forms/locale/en.json index 2a6886586..09e1898f2 100644 --- a/apps/documenteditor/forms/locale/en.json +++ b/apps/documenteditor/forms/locale/en.json @@ -112,6 +112,7 @@ "DE.Controllers.ApplicationController.txtClickToLoad": "Click to load image", "DE.Controllers.ApplicationController.txtArt": "Your text here", "DE.Controllers.ApplicationController.txtEnterDate": "Enter a date", + "DE.Controllers.ApplicationController.openErrorText": "An error has occurred while opening the file.", "DE.Views.ApplicationView.textClear": "Clear All Fields", "DE.Views.ApplicationView.textCopy": "Copy", "DE.Views.ApplicationView.textCut": "Cut", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index b1ad60264..4fb9ceda0 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -119,6 +119,7 @@ PE.ApplicationController = new(function(){ docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_UserInfo(_user); + docInfo.put_CallbackUrl(config.callbackUrl); docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); @@ -538,6 +539,10 @@ PE.ApplicationController = new(function(){ message = me.convertationErrorText; break; + case Asc.c_oAscError.ID.ConvertationOpenError: + message = me.openErrorText; + break; + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -740,6 +745,7 @@ PE.ApplicationController = new(function(){ textAnonymous: 'Anonymous', errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.', - errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.' + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + openErrorText: 'An error has occurred while opening the file' } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index 072abed22..aa0881283 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -28,6 +28,7 @@ "PE.ApplicationController.unknownErrorText": "Unknown error.", "PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "PE.ApplicationController.waitText": "Please, wait...", + "PE.ApplicationController.openErrorText": "An error has occurred while opening the file.", "PE.ApplicationView.txtDownload": "Download", "PE.ApplicationView.txtEmbed": "Embed", "PE.ApplicationView.txtFileLocation": "Open file location", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 6fecbbf21..13c21b3b2 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -119,6 +119,7 @@ SSE.ApplicationController = new(function(){ docInfo.put_Format(docConfig.fileType); docInfo.put_VKey(docConfig.vkey); docInfo.put_UserInfo(_user); + docInfo.put_CallbackUrl(config.callbackUrl); docInfo.put_Token(docConfig.token); docInfo.put_Permissions(_permissions); docInfo.put_EncryptedInfo(config.encryptionKeys); @@ -449,6 +450,10 @@ SSE.ApplicationController = new(function(){ message = me.convertationErrorText; break; + case Asc.c_oAscError.ID.ConvertationOpenError: + message = me.openErrorText; + break; + case Asc.c_oAscError.ID.DownloadError: message = me.downloadErrorText; break; @@ -689,6 +694,7 @@ SSE.ApplicationController = new(function(){ textAnonymous: 'Anonymous', errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", errorLoadingFont: 'Fonts are not loaded.
Please contact your Document Server administrator.', - errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.' + errorTokenExpire: 'The document security token has expired.
Please contact your Document Server administrator.', + openErrorText: 'An error has occurred while opening the file' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index 9c3902578..92237977c 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -28,6 +28,7 @@ "SSE.ApplicationController.unknownErrorText": "Unknown error.", "SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "SSE.ApplicationController.waitText": "Please, wait...", + "SSE.ApplicationController.openErrorText": "An error has occurred while opening the file.", "SSE.ApplicationView.txtDownload": "Download", "SSE.ApplicationView.txtEmbed": "Embed", "SSE.ApplicationView.txtFileLocation": "Open file location",