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

dynamicLogic change

Browse Source
This commit is contained in:
yuri
2016-09-05 11:11:25 +03:00
parent dcae13f4dc
commit e33cdf268a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/admin/dynamic-logic/conditions-string/group-base.js
+3 -1
View File
@@ -74,7 +74,9 @@ Espo.define('views/admin/dynamic-logic/conditions-string/group-base', 'view', fu
item = item || {};
var type = item.type || 'equals';
var additionalData = item.data || {};
var type = additionalData.type || item.type || 'equals';
var viewName = this.getMetadata().get(['clientDefs', 'DynamicLogic', 'itemTypes', type, 'view']);
if (!viewName) return;
client/src/views/admin/dynamic-logic/conditions-string/item-base.js
+5 -3
View File
@@ -52,10 +52,10 @@ Espo.define('views/admin/dynamic-logic/conditions-string/item-base', 'view', fun
this.operator = this.options.operator || this.operator;
this.operatorString = this.options.operatorString || this.operatorString;
this.field = (this.itemData.data || {}).field || this.itemData.attribute;
this.additionalData = (this.itemData.data || {});
this.field = (this.itemData.data || {}).field || this.itemData.attribute;
this.wait(true);
this.getModelFactory().create(this.scope, function (model) {
@@ -70,7 +70,9 @@ Espo.define('views/admin/dynamic-logic/conditions-string/item-base', 'view', fun
},
populateValues: function () {
this.model.set(this.itemData.attribute, this.itemData.value);
if (this.itemData.attribute) {
this.model.set(this.itemData.attribute, this.itemData.value);
}
this.model.set(this.additionalData.values || {});
},