From 41bbcbb542385d567b98a8dc602f0b8f32a19aa7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 26 Oct 2023 12:42:34 +0300 Subject: [PATCH] [DE][PE] Update external links on open --- apps/common/main/lib/controller/ExternalLinks.js | 10 +++++----- apps/documenteditor/main/app/view/ChartSettings.js | 2 ++ apps/documenteditor/main/locale/en.json | 2 ++ apps/presentationeditor/main/app/view/ChartSettings.js | 2 ++ apps/presentationeditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/main/locale/en.json | 2 ++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/controller/ExternalLinks.js b/apps/common/main/lib/controller/ExternalLinks.js index 4ec08b5b4b..89abcc8ac6 100644 --- a/apps/common/main/lib/controller/ExternalLinks.js +++ b/apps/common/main/lib/controller/ExternalLinks.js @@ -79,10 +79,8 @@ define([ setApi: function(api) { this.api = api; if ((this.toolbar.mode.canRequestReferenceData || this.toolbar.mode.isOffline) && this.api) { - if (!!window.SSE) { - this.api.asc_registerCallback('asc_onNeedUpdateExternalReferenceOnOpen', _.bind(this.onNeedUpdateExternalReferenceOnOpen, this)); - this.api.asc_registerCallback('asc_onNeedUpdateExternalReference', _.bind(this.onNeedUpdateExternalReference, this)); - } + !!window.SSE && this.api.asc_registerCallback('asc_onNeedUpdateExternalReference', _.bind(this.onNeedUpdateExternalReference, this)); + this.api.asc_registerCallback('asc_onNeedUpdateExternalReferenceOnOpen', _.bind(this.onNeedUpdateExternalReferenceOnOpen, this)); this.api.asc_registerCallback('asc_onStartUpdateExternalReference', _.bind(this.onStartUpdateExternalReference, this)); this.api.asc_registerCallback('asc_onUpdateExternalReference', _.bind(this.onUpdateExternalReference, this)); this.api.asc_registerCallback('asc_onErrorUpdateExternalReference', _.bind(this.onErrorUpdateExternalReference, this)); @@ -192,7 +190,7 @@ define([ onNeedUpdateExternalReferenceOnOpen: function() { Common.UI.warning({ - msg: this.warnUpdateExternalData, + msg: !!window.SSE ? this.warnUpdateExternalData : !!window.PE ? this.warnUpdateExternalDataPE : this.warnUpdateExternalDataDE, buttons: [{value: 'ok', caption: this.textUpdate, primary: true}, {value: 'cancel', caption: this.textDontUpdate}], maxwidth: 600, callback: _.bind(function(btn) { @@ -251,6 +249,8 @@ define([ txtErrorExternalLink: 'Error: updating is failed', warnUpdateExternalData: 'This workbook contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.', + warnUpdateExternalDataDE: 'This document contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.', + warnUpdateExternalDataPE: 'This presentation contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.', textUpdate: 'Update', textDontUpdate: 'Don\'t Update', textAddExternalData: 'The link to an external source has been added. You can update such links in the Data tab.' diff --git a/apps/documenteditor/main/app/view/ChartSettings.js b/apps/documenteditor/main/app/view/ChartSettings.js index 817a129915..53607419f0 100644 --- a/apps/documenteditor/main/app/view/ChartSettings.js +++ b/apps/documenteditor/main/app/view/ChartSettings.js @@ -1050,6 +1050,8 @@ define([ onStartUpdateExternalReference: function(status) { this._state.isUpdatingReference = status; + if (this._initSettings) return; + var externalRef = this.chartProps.getExternalReference(); this.btnEditData.setDisabled(this._locked || externalRef && this._state.isUpdatingReference); this.btnUpdateData.setDisabled(this._locked || this._state.isUpdatingReference); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 54fb17ca21..c01ee33dcc 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -12,6 +12,8 @@ "Common.Controllers.ExternalLinks.textUpdate": "Update", "Common.Controllers.ExternalLinks.txtErrorExternalLink": "Error: updating is failed", "Common.Controllers.ExternalLinks.warnUpdateExternalData": "This workbook contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataDE": "This document contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataPE": "This presentation contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", "Common.Controllers.ExternalMergeEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalMergeEditor.textClose": "Close", "Common.Controllers.ExternalMergeEditor.warningText": "The object is disabled because it is being edited by another user.", diff --git a/apps/presentationeditor/main/app/view/ChartSettings.js b/apps/presentationeditor/main/app/view/ChartSettings.js index d5f17ba5ac..83eb499305 100644 --- a/apps/presentationeditor/main/app/view/ChartSettings.js +++ b/apps/presentationeditor/main/app/view/ChartSettings.js @@ -956,6 +956,8 @@ define([ onStartUpdateExternalReference: function(status) { this._state.isUpdatingReference = status; + if (this._initSettings) return; + var externalRef = this.chartProps.getExternalReference(); this.btnEditData.setDisabled(this._locked || externalRef && this._state.isUpdatingReference); this.btnUpdateData.setDisabled(this._locked || this._state.isUpdatingReference); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 308e49a432..5c749b7977 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -12,6 +12,8 @@ "Common.Controllers.ExternalLinks.textUpdate": "Update", "Common.Controllers.ExternalLinks.txtErrorExternalLink": "Error: updating is failed", "Common.Controllers.ExternalLinks.warnUpdateExternalData": "This workbook contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataDE": "This document contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataPE": "This presentation contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", "Common.Controllers.ExternalOleEditor.textAnonymous": "Anonymous", "Common.Controllers.ExternalOleEditor.textClose": "Close", "Common.Controllers.ExternalOleEditor.warningText": "The object is disabled because it is being edited by another user.", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 102e8461c9..d768f8dba0 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -9,6 +9,8 @@ "Common.Controllers.ExternalLinks.textUpdate": "Update", "Common.Controllers.ExternalLinks.txtErrorExternalLink": "Error: updating is failed", "Common.Controllers.ExternalLinks.warnUpdateExternalData": "This workbook contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataDE": "This document contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", + "Common.Controllers.ExternalLinks.warnUpdateExternalDataPE": "This presentation contains links to one or more external sources that could be unsafe.
If you trust the links, update them to get the latest data.", "Common.Controllers.History.notcriticalErrorTitle": "Warning", "Common.define.chartData.textArea": "Area", "Common.define.chartData.textAreaStacked": "Stacked area",