Skip to content

EspoCRM – Open Source CRM Application

ref

Yuri Kuznetsov37d437dbaeaf
diff --git a/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/detail.tpl b/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/detail.tpl
index 5e5ad5273a..36ca5fd2fc 100644
--- a/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/detail.tpl
+++ b/client/res/templates/admin/field-manager/fields/dynamic-logic-conditions/detail.tpl
@@ -1,5 +1,13 @@
-<div>
- <div class="top-group-string-container">
- {{{conditionGroup}}}
+{{#if isNotEmpty}}
+ <div>
+ <div class="top-group-string-container">
+ {{{conditionGroup}}}
+ </div>
</div>
-</div>
+{{else}}
+ {{#if isSet}}
+ <span class="none-value">{{translate 'None'}}</span>
+ {{else}}
+ <span class="loading-value"></span>
+ {{/if}}
+{{/if}}
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 912b5ce6f8..0d45852065 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
@@ -36,6 +36,13 @@ export default class extends BaseFieldView {
detailTemplate = 'admin/field-manager/fields/dynamic-logic-conditions/detail'
editTemplate = 'admin/field-manager/fields/dynamic-logic-conditions/edit'
+ data() {
+ return {
+ isSet: this.model.has(this.name),
+ isNotEmpty: this.conditionGroup && this.conditionGroup.length,
+ };
+ }
+
setup() {
this.addActionHandler('editConditions', () => this.edit());