From a92c294255b54e5977f617c5b39cb0d67f6a8f8a Mon Sep 17 00:00:00 2001
From: yuri <yurak@list.ru>
Date: Wed, 5 Oct 2016 12:37:38 +0300
Subject: [PATCH] fix layout manager reset to default

---
 client/src/views/admin/layouts/base.js          | 6 ------
 client/src/views/admin/layouts/filters.js       | 7 ++++++-
 client/src/views/admin/layouts/mass-update.js   | 7 ++++++-
 client/src/views/admin/layouts/relationships.js | 7 ++++++-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/client/src/views/admin/layouts/base.js b/client/src/views/admin/layouts/base.js
index 15d191fb58..d11341d9a3 100644
--- a/client/src/views/admin/layouts/base.js
+++ b/client/src/views/admin/layouts/base.js
@@ -101,12 +101,6 @@ Espo.define('views/admin/layouts/base', 'view', function (Dep) {
             }.bind(this));
         },
 
-        cancel: function () {
-            this.loadLayout(function () {
-                this.render();
-            }.bind(this));
-        },
-
         reset: function () {
             this.render();
         },
diff --git a/client/src/views/admin/layouts/filters.js b/client/src/views/admin/layouts/filters.js
index 4498a8e10f..c55c8acf74 100644
--- a/client/src/views/admin/layouts/filters.js
+++ b/client/src/views/admin/layouts/filters.js
@@ -40,7 +40,12 @@ Espo.define('views/admin/layouts/filters', 'views/admin/layouts/rows', function
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -80,7 +85,7 @@ Espo.define('views/admin/layouts/filters', 'views/admin/layouts/rows', function
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'fields', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },
diff --git a/client/src/views/admin/layouts/mass-update.js b/client/src/views/admin/layouts/mass-update.js
index c09a0d08e8..ea4fd72b4b 100644
--- a/client/src/views/admin/layouts/mass-update.js
+++ b/client/src/views/admin/layouts/mass-update.js
@@ -42,7 +42,12 @@ Espo.define('views/admin/layouts/mass-update', 'views/admin/layouts/rows', funct
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -83,7 +88,7 @@ Espo.define('views/admin/layouts/mass-update', 'views/admin/layouts/rows', funct
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'fields', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },
diff --git a/client/src/views/admin/layouts/relationships.js b/client/src/views/admin/layouts/relationships.js
index 7055049ef1..94e8159808 100644
--- a/client/src/views/admin/layouts/relationships.js
+++ b/client/src/views/admin/layouts/relationships.js
@@ -38,7 +38,12 @@ Espo.define('views/admin/layouts/relationships', 'views/admin/layouts/rows', fun
             Dep.prototype.setup.call(this);
 
             this.wait(true);
+            this.loadLayout(function () {
+                this.wait(false);
+            }.bind(this));
+        },
 
+        loadLayout: function (callback) {
             this.getModelFactory().create(this.scope, function (model) {
                 this.getHelper().layoutManager.get(this.scope, this.type, function (layout) {
 
@@ -80,7 +85,7 @@ Espo.define('views/admin/layouts/relationships', 'views/admin/layouts/rows', fun
                         this.rowLayout[i].label = this.getLanguage().translate(this.rowLayout[i].name, 'links', this.scope);
                     }
 
-                    this.wait(false);
+                    callback();
                 }.bind(this), false);
             }.bind(this));
         },