From 37d437dbaeaf05e25d4e10bc1b9c9685c1e3f835 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Sat, 24 May 2025 11:42:07 +0300 Subject: [PATCH] ref --- .../fields/dynamic-logic-conditions/detail.tpl | 16 ++++++++++++---- .../fields/dynamic-logic-conditions.js | 7 +++++++ 2 files changed, 19 insertions(+), 4 deletions(-) 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 @@ -
-
- {{{conditionGroup}}} +{{#if isNotEmpty}} +
+
+ {{{conditionGroup}}} +
-
+{{else}} + {{#if isSet}} + {{translate 'None'}} + {{else}} + + {{/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());