EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Parameter dynamicLogicConditionTypeList
Yurii19b5bd277f1e
diff --git a/application/Espo/Tools/EntityManager/Hook/Hooks/PipelinesUpdateHook.php b/application/Espo/Tools/EntityManager/Hook/Hooks/PipelinesUpdateHook.phpindex ec4a51679e..0a528c0861 100644--- a/application/Espo/Tools/EntityManager/Hook/Hooks/PipelinesUpdateHook.php+++ b/application/Espo/Tools/EntityManager/Hook/Hooks/PipelinesUpdateHook.php@@ -111,6 +111,10 @@ class PipelinesUpdateHook implements UpdateHook'inlineEditDisabled',],'view' => 'views/fields/extra/pipeline-stage',+ 'dynamicLogicConditionTypeList' => [+ 'isEmpty',+ 'isNotEmpty',+ ]],],'links' => [diff --git a/client/src/views/admin/dynamic-logic/conditions/field-types/base.js b/client/src/views/admin/dynamic-logic/conditions/field-types/base.jsindex c68cee3e61..8c5eb8e2cf 100644--- a/client/src/views/admin/dynamic-logic/conditions/field-types/base.js+++ b/client/src/views/admin/dynamic-logic/conditions/field-types/base.js@@ -102,7 +102,10 @@ export default class DynamicLogicConditionFieldTypeBaseView extends View {this.itemData = this.options.itemData;this.additionalData = (this.itemData.data || {});- this.typeList = this.getMetadata().get(`clientDefs.DynamicLogic.fieldTypes.${this.fieldType}.typeList`);+ // Warning. The same data is retrieved in group-base.+ this.typeList =+ this.getMetadata().get(`entityDefs.${this.scope}.fields.${this.field}.dynamicLogicConditionTypeList`) ??+ this.getMetadata().get(`clientDefs.DynamicLogic.fieldTypes.${this.fieldType}.typeList`);this.baseModel = new Model();diff --git a/client/src/views/admin/dynamic-logic/conditions/group-base.js b/client/src/views/admin/dynamic-logic/conditions/group-base.jsindex 847ed75282..bada705aa0 100644--- a/client/src/views/admin/dynamic-logic/conditions/group-base.js+++ b/client/src/views/admin/dynamic-logic/conditions/group-base.js@@ -294,7 +294,12 @@ export default class DynamicLogicConditionGroupBaseView extends View {throw new Error();}- const type = this.getMetadata().get(['clientDefs', 'DynamicLogic', 'fieldTypes', fieldType, 'typeList'])[0];+ // Warning. The same data is retrieved in conditions/base.+ const typeList =+ this.getMetadata().get(`entityDefs.${this.scope}.fields.${field}.dynamicLogicConditionTypeList`) ??+ this.getMetadata().get(`clientDefs.DynamicLogic.fieldTypes.${fieldType}.typeList`);++ const type = typeList[0];const i = this.getIndexForNewItem();const key = this.getKey(i);diff --git a/schema/metadata/entityDefs.json b/schema/metadata/entityDefs.jsonindex 729946c2a6..89d75b67b1 100644--- a/schema/metadata/entityDefs.json+++ b/schema/metadata/entityDefs.json@@ -1095,6 +1095,11 @@"type": "boolean","description": "Dynamic logic cannot be customized."},+ "dynamicLogicConditionTypeList": {+ "type": "array",+ "items": {"type": "string"},+ "description": "Overrides Dynamic Logic condition types. As of 10.0."+ },"fieldManagerParamList": {"type": "array","items": {