From ea0d53d0e608846c68cc4e129c737dd4c57fdeb3 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Thu, 2 Apr 2020 18:07:46 +0300
Subject: [PATCH] bottom layout order fix

---
 .../src/views/admin/layouts/bottom-panels-detail.js  | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/src/views/admin/layouts/bottom-panels-detail.js b/client/src/views/admin/layouts/bottom-panels-detail.js
index 43b397f863..39a3a68b09 100644
--- a/client/src/views/admin/layouts/bottom-panels-detail.js
+++ b/client/src/views/admin/layouts/bottom-panels-detail.js
@@ -50,6 +50,7 @@ define('views/admin/layouts/bottom-panels-detail', 'views/admin/layouts/side-pan
                 params['stream'] = {
                     name: 'stream',
                     sticked: true,
+                    index: 2,
                 };
             }
             (this.getMetadata().get(['clientDefs', this.scope, 'bottomPanels', this.viewType]) || []).forEach(function (item) {
@@ -58,7 +59,11 @@ define('views/admin/layouts/bottom-panels-detail', 'views/admin/layouts/side-pan
                 if (item.label) {
                     labels[item.name] = item.label;
                 }
-                params[item.name] = item;
+                params[item.name] = Espo.Utils.clone(item);
+
+                if ('order' in item) {
+                    params[item.name].index = item.order;
+                }
             }, this);
 
             this.links = {};
@@ -74,6 +79,7 @@ define('views/admin/layouts/bottom-panels-detail', 'views/admin/layouts/side-pan
 
                     var item = {
                         name: link,
+                        index: 5,
                     };
                     this.dataAttributeList.forEach(function (attribute) {
                         if (attribute in item) return;
@@ -97,6 +103,10 @@ define('views/admin/layouts/bottom-panels-detail', 'views/admin/layouts/side-pan
 
             this.rowLayout = [];
 
+            panelListAll = panelListAll.sort(function (v1, v2) {
+                return params[v1].index - params[v2].index
+            }.bind(this));
+
             panelListAll.push('_delimiter_');
 
             if (!layout['_delimiter_']) {