Skip to content

EspoCRM – Open Source CRM Application

foreign fields setup fix

Yuri Kuznetsov9b0549a76225
diff --git a/client/src/views/fields/foreign-array.js b/client/src/views/fields/foreign-array.js
index 8d125e54c0..6bb3009d00 100644
--- a/client/src/views/fields/foreign-array.js
+++ b/client/src/views/fields/foreign-array.js
@@ -35,14 +35,14 @@ class ForeignArrayFieldView extends ArrayFieldView {
setupOptions() {
this.params.options = [];
- let field = this.params.field;
- let link = this.params.link;
+ const field = this.params.field;
+ const link = this.params.link;
if (!field || !link) {
return;
}
- let scope = this.getMetadata().get(['entityDefs', this.model.entityType, 'links', link, 'entity']);
+ const scope = this.getMetadata().get(['entityDefs', this.model.entityType, 'links', link, 'entity']);
if (!scope) {
return;
diff --git a/client/src/views/fields/foreign-bool.js b/client/src/views/fields/foreign-bool.js
index ccc594498d..40acf2d048 100644
--- a/client/src/views/fields/foreign-bool.js
+++ b/client/src/views/fields/foreign-bool.js
@@ -34,15 +34,14 @@ class ForeignBoolFieldView extends BoolFieldView {
type = 'foreign'
setup() {
- super.setup();
-
- let helper = new Helper(this);
-
- let foreignParams = helper.getForeignParams();
+ const helper = new Helper(this);
+ const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-date.js b/client/src/views/fields/foreign-date.js
index 91f8fb00ad..cee07fa0bc 100644
--- a/client/src/views/fields/foreign-date.js
+++ b/client/src/views/fields/foreign-date.js
@@ -34,15 +34,14 @@ class ForeignDateFieldView extends DateFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-datetime.js b/client/src/views/fields/foreign-datetime.js
index 93df2fb67a..8a3b379451 100644
--- a/client/src/views/fields/foreign-datetime.js
+++ b/client/src/views/fields/foreign-datetime.js
@@ -34,15 +34,14 @@ class ForeignDatetimeFieldView extends DatetimeFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-float.js b/client/src/views/fields/foreign-float.js
index bd6b34f45b..948825bf43 100644
--- a/client/src/views/fields/foreign-float.js
+++ b/client/src/views/fields/foreign-float.js
@@ -34,15 +34,14 @@ class ForeignFloatFieldView extends FloatFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-int.js b/client/src/views/fields/foreign-int.js
index cedae7abf8..53684d0b81 100644
--- a/client/src/views/fields/foreign-int.js
+++ b/client/src/views/fields/foreign-int.js
@@ -34,17 +34,16 @@ class ForeignIntFieldView extends IntFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
this.disableFormatting = foreignParams.disableFormatting;
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-text.js b/client/src/views/fields/foreign-text.js
index e25def65a8..0148f979e0 100644
--- a/client/src/views/fields/foreign-text.js
+++ b/client/src/views/fields/foreign-text.js
@@ -34,15 +34,14 @@ class ForeignTextFieldView extends TextFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-url-multiple.js b/client/src/views/fields/foreign-url-multiple.js
index 214f17c0f9..84c9900768 100644
--- a/client/src/views/fields/foreign-url-multiple.js
+++ b/client/src/views/fields/foreign-url-multiple.js
@@ -35,15 +35,14 @@ class ForeignUrlMultipleFieldView extends UrlMultipleFieldView {
readOnly = true
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-url.js b/client/src/views/fields/foreign-url.js
index 8e967eb699..bf891ecb77 100644
--- a/client/src/views/fields/foreign-url.js
+++ b/client/src/views/fields/foreign-url.js
@@ -35,15 +35,14 @@ class ForeignUrlFieldView extends UrlFieldView {
readOnly = true
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}
diff --git a/client/src/views/fields/foreign-varchar.js b/client/src/views/fields/foreign-varchar.js
index 95554b1855..efb9ea21fd 100644
--- a/client/src/views/fields/foreign-varchar.js
+++ b/client/src/views/fields/foreign-varchar.js
@@ -34,15 +34,14 @@ class ForeignVarcharFieldView extends VarcharFieldView {
type = 'foreign'
setup() {
- super.setup();
-
const helper = new Helper(this);
-
const foreignParams = helper.getForeignParams();
- for (let param in foreignParams) {
+ for (const param in foreignParams) {
this.params[param] = foreignParams[param];
}
+
+ super.setup();
}
}