Skip to content

EspoCRM – Open Source CRM Application

dynamic logic field ref

Yuri Kuznetsov47c1a6fd0528
diff --git a/client/src/views/admin/field-manager/fields/dynamic-logic-conditions.js b/client/src/views/admin/field-manager/fields/dynamic-logic-conditions.js
index 0d45852065..301b5e8c32 100644
--- a/client/src/views/admin/field-manager/fields/dynamic-logic-conditions.js
+++ b/client/src/views/admin/field-manager/fields/dynamic-logic-conditions.js
@@ -29,7 +29,7 @@
import BaseFieldView from 'views/fields/base';
/**
- * Important. Used in extensions.
+ * Important. Extended in extensions.
*/
export default class extends BaseFieldView {
@@ -46,25 +46,23 @@ export default class extends BaseFieldView {
setup() {
this.addActionHandler('editConditions', () => this.edit());
- this.conditionGroup = Espo.Utils.cloneDeep((this.model.get(this.name) || {}).conditionGroup || []);
-
this.scope = this.params.scope || this.options.scope;
+ }
- this.createStringView();
+ async prepare() {
+ this.conditionGroup = Espo.Utils.cloneDeep((this.model.attributes[this.name] || {}).conditionGroup || []);
+
+ return this.createStringView();
}
- createStringView() {
- this.createView('conditionGroup', 'views/admin/dynamic-logic/conditions-string/group-base', {
+ async createStringView() {
+ return this.createView('conditionGroup', 'views/admin/dynamic-logic/conditions-string/group-base', {
selector: '.top-group-string-container',
itemData: {
value: this.conditionGroup
},
operator: 'and',
scope: this.scope,
- }, view => {
- if (this.isRendered()) {
- view.render();
- }
});
}
@@ -75,12 +73,13 @@ export default class extends BaseFieldView {
}, view => {
view.render();
- this.listenTo(view, 'apply', conditionGroup => {
+ this.listenTo(view, 'apply', async conditionGroup => {
this.conditionGroup = conditionGroup;
this.trigger('change');
- this.createStringView();
+ await this.createStringView();
+ await this.reRender();
});
});
}