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

Fix Bug 48962

Browse source
This commit is contained in:
Julia Radzhabova 2021-08-19 15:50:54 +03:00
parent 824b680acb
commit 24a9b14958
6 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -4157,7 +4157,18 @@ define([
Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled, datavalue);//guid, can edit settings for requested signature
break;
case 3:
this.api.asc_RemoveSignature(datavalue); //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(datavalue);
}
}
});
break;
}
},
@ -4644,6 +4655,9 @@ define([
textRemComboBox: 'Remove Combo Box',
textRemDropdown: 'Remove Dropdown',
textRemPicture: 'Remove Image',
textRemField: 'Remove Text Field'
textRemField: 'Remove Text Field',
txtRemoveWarning: 'Do you want to remove this signature?<br>It can\'t be undone.',
notcriticalErrorTitle: 'Warning'
}, DE.Views.DocumentHolder || {}));
});

2
apps/documenteditor/main/locale/en.json
View file

@ -1577,6 +1577,8 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
"DE.Views.DocumentHolder.txtRemoveWarning": "Do you want to remove this signature?<br>It can't be undone.",
"DE.Views.DocumentHolder.notcriticalErrorTitle": "Warning",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Drop Cap",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Margins",

2
apps/documenteditor/main/locale/ru.json
View file

@ -1575,6 +1575,8 @@
"DE.Views.DocumentHolder.txtUngroup": "Разгруппировать",
"DE.Views.DocumentHolder.updateStyleText": "Обновить стиль %1",
"DE.Views.DocumentHolder.vertAlignText": "Вертикальное выравнивание",
"DE.Views.DocumentHolder.txtRemoveWarning": "Вы хотите удалить эту подпись?<br>Это нельзя отменить.",
"DE.Views.DocumentHolder.notcriticalErrorTitle": "Внимание",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Границы и заливка",
"DE.Views.DropcapSettingsAdvanced.strDropcap": "Буквица",
"DE.Views.DropcapSettingsAdvanced.strMargins": "Поля",

16
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -3499,7 +3499,18 @@ define([
Common.NotificationCenter.trigger('protect:signature', 'visible', this._isDisabled, datavalue);//guid, can edit settings for requested signature
break;
case 3:
this.api.asc_RemoveSignature(datavalue); //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(datavalue);
}
}
});
break;
}
},
@ -3774,7 +3785,8 @@ define([
txtImportWizard: 'Text Import Wizard',
textPasteSpecial: 'Paste special',
textStopExpand: 'Stop automatically expanding tables',
textAutoCorrectSettings: 'AutoCorrect options'
textAutoCorrectSettings: 'AutoCorrect options',
txtRemoveWarning: 'Do you want to remove this signature?<br>It can\'t be undone.'
}, SSE.Controllers.DocumentHolder || {}));
});

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -569,6 +569,7 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Use text import wizard",
"SSE.Controllers.DocumentHolder.txtWidth": "Width",
"SSE.Controllers.DocumentHolder.txtRemoveWarning": "Do you want to remove this signature?<br>It can't be undone.",
"SSE.Controllers.FormulaDialog.sCategoryAll": "All",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Cube",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Database",

1
apps/spreadsheeteditor/main/locale/ru.json
View file

@ -569,6 +569,7 @@
"SSE.Controllers.DocumentHolder.txtUndoExpansion": "Отменить авторазвертывание таблицы",
"SSE.Controllers.DocumentHolder.txtUseTextImport": "Использовать мастер импорта текста",
"SSE.Controllers.DocumentHolder.txtWidth": "Ширина",
"SSE.Controllers.DocumentHolder.txtRemoveWarning": "Вы хотите удалить эту подпись?<br>Это нельзя отменить.",
"SSE.Controllers.FormulaDialog.sCategoryAll": "Все",
"SSE.Controllers.FormulaDialog.sCategoryCube": "Аналитические",
"SSE.Controllers.FormulaDialog.sCategoryDatabase": "Базы данных",