From 1968bc470b0087be2f9ed22ba741e1cfda09f315 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 4 Mar 2021 12:48:15 +0300 Subject: [PATCH] Fix Bug 48962 --- .../main/app/view/SignatureSettings.js | 16 ++++++++++++++-- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/main/locale/ru.json | 1 + .../main/app/view/SignatureSettings.js | 16 ++++++++++++++-- apps/presentationeditor/main/locale/en.json | 1 + apps/presentationeditor/main/locale/ru.json | 1 + .../main/app/view/SignatureSettings.js | 16 ++++++++++++++-- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/locale/ru.json | 1 + 9 files changed, 48 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/SignatureSettings.js b/apps/documenteditor/main/app/view/SignatureSettings.js index 9cb6f8b34..fa8c88153 100644 --- a/apps/documenteditor/main/app/view/SignatureSettings.js +++ b/apps/documenteditor/main/app/view/SignatureSettings.js @@ -310,7 +310,18 @@ define([ Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature break; case 3: - this.api.asc_RemoveSignature(guid); + var me = this; + Common.UI.warning({ + title: this.notcriticalErrorTitle, + msg: this.txtRemoveWarning, + buttons: ['ok', 'cancel'], + primary: 'ok', + callback: function(btn) { + if (btn == 'ok') { + me.api.asc_RemoveSignature(guid); + } + } + }); break; } }, @@ -415,7 +426,8 @@ define([ notcriticalErrorTitle: 'Warning', txtEditWarning: 'Editing will remove the signatures from the document.
Are you sure you want to continue?', strDelete: 'Remove Signature', - strSigner: 'Signer' + strSigner: 'Signer', + txtRemoveWarning: 'Are you sure you want to remove this signature?
This action cannot be undone.' }, DE.Views.SignatureSettings || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bb7dc8ba7..ca1382e01 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2194,6 +2194,7 @@ "DE.Views.SignatureSettings.strValid": "Valid signatures", "DE.Views.SignatureSettings.txtContinueEditing": "Edit anyway", "DE.Views.SignatureSettings.txtEditWarning": "Editing will remove the signatures from the document.
Are you sure you want to continue?", + "DE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?
This action cannot be undone.", "DE.Views.SignatureSettings.txtRequestedSignatures": "This document needs to be signed.", "DE.Views.SignatureSettings.txtSigned": "Valid signatures have been added to the document. The document is protected from editing.", "DE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in the document are invalid or could not be verified. The document is protected from editing.", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index ff98a8e10..e9499de80 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -2194,6 +2194,7 @@ "DE.Views.SignatureSettings.strValid": "Действительные подписи", "DE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать", "DE.Views.SignatureSettings.txtEditWarning": "При редактировании из документа будут удалены подписи.
Вы действительно хотите продолжить?", + "DE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?
Это действие нельзя отменить.", "DE.Views.SignatureSettings.txtRequestedSignatures": "Этот документ требуется подписать.", "DE.Views.SignatureSettings.txtSigned": "В документ добавлены действительные подписи. Документ защищен от редактирования.", "DE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в документе недействительны или их нельзя проверить. Документ защищен от редактирования.", diff --git a/apps/presentationeditor/main/app/view/SignatureSettings.js b/apps/presentationeditor/main/app/view/SignatureSettings.js index 0a06cc88d..e72f26c40 100644 --- a/apps/presentationeditor/main/app/view/SignatureSettings.js +++ b/apps/presentationeditor/main/app/view/SignatureSettings.js @@ -266,7 +266,18 @@ define([ this.api.asc_ViewCertificate(item.cmpEl.attr('data-value')); break; case 3: - this.api.asc_RemoveSignature(guid); + var me = this; + Common.UI.warning({ + title: this.notcriticalErrorTitle, + msg: this.txtRemoveWarning, + buttons: ['ok', 'cancel'], + primary: 'ok', + callback: function(btn) { + if (btn == 'ok') { + me.api.asc_RemoveSignature(guid); + } + } + }); break; } }, @@ -363,7 +374,8 @@ define([ txtContinueEditing: 'Edit anyway', notcriticalErrorTitle: 'Warning', txtEditWarning: 'Editing will remove the signatures from the presentation.
Are you sure you want to continue?', - strDelete: 'Remove Signature' + strDelete: 'Remove Signature', + txtRemoveWarning: 'Are you sure you want to remove this signature?
This action cannot be undone.' }, PE.Views.SignatureSettings || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 14870f214..33f6c0343 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1552,6 +1552,7 @@ "PE.Views.SignatureSettings.strValid": "Valid signatures", "PE.Views.SignatureSettings.txtContinueEditing": "Edit anyway", "PE.Views.SignatureSettings.txtEditWarning": "Editing will remove the signatures from the presentation.
Are you sure you want to continue?", + "PE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?
This action cannot be undone.", "PE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the presentation. The presentation is protected from editing.", "PE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in presentation are invalid or could not be verified. The presentation is protected from editing.", "PE.Views.SlideSettings.strBackground": "Background color", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index d4cb5016c..0212ee48f 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -1552,6 +1552,7 @@ "PE.Views.SignatureSettings.strValid": "Действительные подписи", "PE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать", "PE.Views.SignatureSettings.txtEditWarning": "При редактировании из презентации будут удалены подписи.
Вы действительно хотите продолжить?", + "PE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?
Это действие нельзя отменить.", "PE.Views.SignatureSettings.txtSigned": "В презентацию добавлены действительные подписи. Презентация защищена от редактирования.", "PE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в презентации недействительны или их нельзя проверить. Презентация защищена от редактирования.", "PE.Views.SlideSettings.strBackground": "Цвет фона", diff --git a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js index f01360793..520dfe326 100644 --- a/apps/spreadsheeteditor/main/app/view/SignatureSettings.js +++ b/apps/spreadsheeteditor/main/app/view/SignatureSettings.js @@ -310,7 +310,18 @@ define([ Common.NotificationCenter.trigger('protect:signature', 'visible', !!parseInt(item.cmpEl.attr('data-value')), guid);// can edit settings for requested signature break; case 3: - this.api.asc_RemoveSignature(guid); + var me = this; + Common.UI.warning({ + title: this.notcriticalErrorTitle, + msg: this.txtRemoveWarning, + buttons: ['ok', 'cancel'], + primary: 'ok', + callback: function(btn) { + if (btn == 'ok') { + me.api.asc_RemoveSignature(guid); + } + } + }); break; } }, @@ -416,7 +427,8 @@ define([ notcriticalErrorTitle: 'Warning', txtEditWarning: 'Editing will remove the signatures from the workbook.
Are you sure you want to continue?', strDelete: 'Remove Signature', - strSigner: 'Signer' + strSigner: 'Signer', + txtRemoveWarning: 'Are you sure you want to remove this signature?
This action cannot be undone.' }, SSE.Views.SignatureSettings || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 84cedd5dd..973d8fd9b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2461,6 +2461,7 @@ "SSE.Views.SignatureSettings.strValid": "Valid signatures", "SSE.Views.SignatureSettings.txtContinueEditing": "Edit anyway", "SSE.Views.SignatureSettings.txtEditWarning": "Editing will remove the signatures from the spreadsheet.
Are you sure you want to continue?", + "SSE.Views.SignatureSettings.txtRemoveWarning": "Are you sure you want to remove this signature?
This action cannot be undone.", "SSE.Views.SignatureSettings.txtRequestedSignatures": "This spreadsheet needs to be signed.", "SSE.Views.SignatureSettings.txtSigned": "Valid signatures has been added to the spreadsheet. The spreadsheet is protected from editing.", "SSE.Views.SignatureSettings.txtSignedInvalid": "Some of the digital signatures in spreadsheet are invalid or could not be verified. The spreadsheet is protected from editing.", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 31a147dcf..8283d9af4 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -2461,6 +2461,7 @@ "SSE.Views.SignatureSettings.strValid": "Действительные подписи", "SSE.Views.SignatureSettings.txtContinueEditing": "Все равно редактировать", "SSE.Views.SignatureSettings.txtEditWarning": "При редактировании из электронной таблицы будут удалены подписи.
Вы действительно хотите продолжить?", + "SSE.Views.SignatureSettings.txtRemoveWarning": "Вы действительно хотите удалить эту подпись?
Это действие нельзя отменить.", "SSE.Views.SignatureSettings.txtRequestedSignatures": "Эту таблицу требуется подписать.", "SSE.Views.SignatureSettings.txtSigned": "В электронную таблицу добавлены действительные подписи. Таблица защищена от редактирования.", "SSE.Views.SignatureSettings.txtSignedInvalid": "Некоторые из цифровых подписей в электронной таблице недействительны или их нельзя проверить. Таблица защищена от редактирования.",