mirror of
https://github.com/espocrm/espocrm.git
synced 2026-07-01 08:26:04 +00:00
Merge branch 'hotfix/4.5.1'
This commit is contained in:
@@ -127,6 +127,7 @@ Espo.define('views/fields/link-multiple', 'views/fields/base', function (Dep) {
|
||||
dialog.render();
|
||||
self.notify(false);
|
||||
this.listenToOnce(dialog, 'select', function (models) {
|
||||
this.clearView('dialog');
|
||||
if (Object.prototype.toString.call(models) !== '[object Array]') {
|
||||
models = [models];
|
||||
}
|
||||
|
||||
@@ -125,6 +125,7 @@ Espo.define('views/fields/link-parent', 'views/fields/base', function (Dep) {
|
||||
dialog.render();
|
||||
Espo.Ui.notify(false);
|
||||
this.listenToOnce(dialog, 'select', function (model) {
|
||||
this.clearView('dialog');
|
||||
this.select(model);
|
||||
}, this);
|
||||
}, this);
|
||||
|
||||
@@ -107,9 +107,10 @@ Espo.define('views/fields/link', 'views/fields/base', function (Dep) {
|
||||
view.render();
|
||||
this.notify(false);
|
||||
this.listenToOnce(view, 'select', function (model) {
|
||||
this.clearView('dialog');
|
||||
this.select(model);
|
||||
}, this);
|
||||
}.bind(this));
|
||||
}, this);
|
||||
});
|
||||
this.addActionHandler('clearLink', function () {
|
||||
this.clearLink();
|
||||
@@ -133,6 +134,7 @@ Espo.define('views/fields/link', 'views/fields/base', function (Dep) {
|
||||
view.render();
|
||||
this.notify(false);
|
||||
this.listenToOnce(view, 'select', function (models) {
|
||||
this.clearView('dialog');
|
||||
if (Object.prototype.toString.call(models) !== '[object Array]') {
|
||||
models = [models];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user