diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index ad4b37ef1..f8084bb82 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -2049,16 +2049,12 @@ define([ warningMsg: this.txtUnlockRangeWarning, txtOpenFile: this.txtUnlockRangeDescription, validatePwd: false, - buttons: [ - { - value: 'ok', - caption: this.txtUnlock - }, 'cancel'], - primary: 'ok', handler: function (result, value) { if (result == 'ok') { if (me.api) { - me.api.asc_checkProtectedRangesPassword(value, data); + if (apiCallback) { + apiCallback(me.api.asc_checkProtectedRangesPassword(value.drmOptions.asc_getPassword(), data)); + } } me.onEditComplete(me.application.getController('DocumentHolder').getView('DocumentHolder')); } diff --git a/apps/spreadsheeteditor/main/app/controller/WBProtection.js b/apps/spreadsheeteditor/main/app/controller/WBProtection.js index e524cd926..7edc649a7 100644 --- a/apps/spreadsheeteditor/main/app/controller/WBProtection.js +++ b/apps/spreadsheeteditor/main/app/controller/WBProtection.js @@ -230,6 +230,7 @@ define([ props: props, handler: function(result, settings) { if (result=='protect-sheet') { + me.api.asc_setProtectedRanges(settings.arr, settings.deletedArr); me.onSheetClick(true); } else if (result == 'ok') { me.api.asc_setProtectedRanges(settings.arr, settings.deletedArr); diff --git a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js index 760571002..66701f65f 100644 --- a/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ProtectRangesDlg.js @@ -264,7 +264,6 @@ define([ 'text!spreadsheeteditor/main/app/template/ProtectRangesDlg.template', rec.set('name', props.asc_getName()); rec.set('range', props.asc_getSqref()); rec.set('pwd', props.asc_isPassword()); - props.asc_setName(); } else { rec = me.rangeList.store.add({ name: props.asc_getName(),