espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.2.6'

Browse Source
This commit is contained in:
yuri
2016-10-05 12:37:45 +03:00
parent 7c554a605e a92c294255
commit a96314f0f0
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/admin/layouts/base.js
-6
View File
@@ -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();
},
client/src/views/admin/layouts/filters.js
+6 -1
View File
@@ -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));
},
client/src/views/admin/layouts/mass-update.js
+6 -1
View File
@@ -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));
},
client/src/views/admin/layouts/relationships.js
+6 -1
View File
@@ -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));
},