From 9c5b6f5ba5ae05d6949244a96b08923dbc1c4204 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 17 Aug 2016 14:55:28 +0300 Subject: [PATCH] [DE] Bug with mail merge: select locked paragraph, press Mail merge button on the toolbar, select xls file -> Mail merge settings on the right panel are not disabled (Insert Merge fields must be disabled). --- apps/documenteditor/main/app/controller/RightMenu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index f9072dcdc..0539710de 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -310,6 +310,7 @@ define([ this._settings[type].hidden = 0; this._settings[type].btn.setDisabled(false); this.rightmenu.SetActivePane(type, true); + this._settings[type].panel.setLocked(this._settings[type].locked); this._settings[type].panel.ChangeSettings.call(this._settings[type].panel); },