From b49d3f65c8d43d7e997d2b7e62a5c415f9a9896f Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Thu, 11 Nov 2021 13:09:40 +0300
Subject: [PATCH] [DE] Fix layout customization. Hide mailmerge button

---
 apps/common/main/lib/controller/LayoutManager.js       | 2 +-
 apps/documenteditor/main/app/template/Toolbar.template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/common/main/lib/controller/LayoutManager.js b/apps/common/main/lib/controller/LayoutManager.js
index 3efe4709f..f5197981d 100644
--- a/apps/common/main/lib/controller/LayoutManager.js
+++ b/apps/common/main/lib/controller/LayoutManager.js
@@ -59,7 +59,7 @@ Common.UI.LayoutManager = new(function() {
         for (var name in config) {
             if(config.hasOwnProperty(name)) {
                 if(typeof config[name] === 'object')
-                    _applyCustomization(config[name], el, name + '-');
+                    _applyCustomization(config[name], el, (prefix || '') + name + '-');
                 else if (config[name] === false) {
                     var selector = '[data-layout-name=' + (prefix || '') + name + ']',
                         cmp = el ? el.find(selector) : $(selector);
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 0d5ce64ed..8e7a78524 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -75,7 +75,7 @@
                     </div>
                     <div class="elset">
                         <span class="btn-slot split" id="slot-btn-copystyle"></span>
-                        <span class="btn-slot" id="slot-btn-mailrecepients"></span>
+                        <span class="btn-slot" id="slot-btn-mailrecepients" data-layout-name="toolbar-home-mailmerge"></span>
                     </div>
                 </div>
                 <div class="group small" id="slot-field-styles"></div>
@@ -124,7 +124,7 @@
                     <span class="btn-slot text x-huge" id="slot-btn-controls"></span>
                 </div>
             </section>
-            <section class="panel" data-tab="layout" data-layout-name="toolbar-layout">
+            <section class="panel" data-tab="layout">
                 <div class="group">
                     <span class="btn-slot text x-huge" id="slot-btn-pagemargins"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-pageorient"></span>
@@ -146,7 +146,7 @@
                     <span class="btn-slot text x-huge" id="slot-btn-watermark"></span>
                 </div>
             </section>
-            <section class="panel" data-tab="links" data-layout-name="toolbar-references">
+            <section class="panel" data-tab="links">
                 <div class="group">
                     <span class="btn-slot text x-huge btn-contents"></span>
                     <span class="btn-slot text x-huge" id="slot-btn-contents-update"></span>