diff --git a/template/screen-macro/DefaultScreenMacros.qvt.ftl b/template/screen-macro/DefaultScreenMacros.qvt.ftl index 8c8bc28bd..3062b48a2 100644 --- a/template/screen-macro/DefaultScreenMacros.qvt.ftl +++ b/template/screen-macro/DefaultScreenMacros.qvt.ftl @@ -2115,6 +2115,7 @@ a => A, d => D, y => Y <#t><#if widgetType == "drop-down"> <#assign ddFieldNode = widgetNode?parent?parent> <#assign allowMultiple = ec.getResource().expandNoL10n(widgetNode["@allow-multiple"]!, "") == "true"> + <#assign isListOptions = widgetNode["list-options"]?has_content> <#assign isDynamicOptions = widgetNode["dynamic-options"]?has_content> <#assign options = sri.getFieldOptions(widgetNode)> <#assign currentValue = sri.getFieldValuePlainString(ddFieldNode, "")> @@ -2127,7 +2128,7 @@ a => A, d => D, y => Y <#if !optionsHasCurrent && widgetNode["@current-description"]?has_content><#assign currentDescription = ec.getResource().expand(widgetNode["@current-description"], "")> <#t><#if allowMultiple> <#list currentValueList as listValue> - <#t><#if isDynamicOptions> + <#t><#if isDynamicOptions && !isListOptions> <#assign doNode = widgetNode["dynamic-options"][0]> <#assign transValue = sri.getFieldTransitionValue(doNode["@transition"], doNode, listValue, doNode["@label-field"]!"label", alwaysGet)!> <#t><#if transValue?has_content>${transValue}<#elseif listValue?has_content>${listValue}<#if listValue_has_next>, @@ -2137,7 +2138,7 @@ a => A, d => D, y => Y <#t> <#else> - <#t><#if isDynamicOptions> + <#t><#if isDynamicOptions && !isListOptions> <#assign doNode = widgetNode["dynamic-options"][0]> <#assign transValue = sri.getFieldTransitionValue(doNode["@transition"], doNode, currentValue, doNode["@label-field"]!"label", alwaysGet)!> <#t><#if transValue?has_content>${transValue}<#elseif currentValue?has_content>${currentValue} diff --git a/template/screen-macro/DefaultScreenMacros.vuet.ftl b/template/screen-macro/DefaultScreenMacros.vuet.ftl index 50688ff75..e25470efc 100644 --- a/template/screen-macro/DefaultScreenMacros.vuet.ftl +++ b/template/screen-macro/DefaultScreenMacros.vuet.ftl @@ -1976,6 +1976,7 @@ ${sri.getFieldValueString(.node)?html} <#t><#if widgetType == "drop-down"> <#assign ddFieldNode = widgetNode?parent?parent> <#assign allowMultiple = ec.getResource().expandNoL10n(widgetNode["@allow-multiple"]!, "") == "true"> + <#assign isListOptions = widgetNode["list-options"]?has_content> <#assign isDynamicOptions = widgetNode["dynamic-options"]?has_content> <#assign options = sri.getFieldOptions(widgetNode)> <#assign currentValue = sri.getFieldValuePlainString(ddFieldNode, "")> @@ -1988,7 +1989,7 @@ ${sri.getFieldValueString(.node)?html} <#if !optionsHasCurrent && widgetNode["@current-description"]?has_content><#assign currentDescription = ec.getResource().expand(widgetNode["@current-description"], "")> <#t><#if allowMultiple> <#list currentValueList as listValue> - <#t><#if isDynamicOptions> + <#t><#if isDynamicOptions && !isListOptions> <#assign doNode = widgetNode["dynamic-options"][0]> <#assign transValue = sri.getFieldTransitionValue(doNode["@transition"], doNode, listValue, doNode["@label-field"]!"label", alwaysGet)!> <#t><#if transValue?has_content>${transValue}<#elseif listValue?has_content>${listValue}<#if listValue_has_next>, @@ -1998,7 +1999,7 @@ ${sri.getFieldValueString(.node)?html} <#t> <#else> - <#t><#if isDynamicOptions> + <#t><#if isDynamicOptions && !isListOptions> <#assign doNode = widgetNode["dynamic-options"][0]> <#assign transValue = sri.getFieldTransitionValue(doNode["@transition"], doNode, currentValue, doNode["@label-field"]!"label", alwaysGet)!> <#t><#if transValue?has_content>${transValue}<#elseif currentValue?has_content>${currentValue}