unset options when none exist (#27348)
Closes #25110 Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
parent
b9d92075ae
commit
6c0f7444b5
1 changed files with 11 additions and 10 deletions
|
@ -146,13 +146,14 @@
|
||||||
<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
|
<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
|
||||||
<#elseif attribute.validators.options?? && attribute.validators.options.options??>
|
<#elseif attribute.validators.options?? && attribute.validators.options.options??>
|
||||||
<#assign options=attribute.validators.options.options>
|
<#assign options=attribute.validators.options.options>
|
||||||
|
<#else>
|
||||||
|
<#assign options=[]>
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
<#if options??>
|
|
||||||
<#list options as option>
|
<#list options as option>
|
||||||
<option value="${option}" <#if attribute.values?seq_contains(option)>selected</#if>><@selectOptionLabelText attribute=attribute option=option/></option>
|
<option value="${option}" <#if attribute.values?seq_contains(option)>selected</#if>><@selectOptionLabelText attribute=attribute option=option/></option>
|
||||||
</#list>
|
</#list>
|
||||||
</#if>
|
|
||||||
</select>
|
</select>
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
|
@ -173,9 +174,10 @@
|
||||||
<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
|
<#assign options=attribute.validators[attribute.annotations.inputOptionsFromValidation].options>
|
||||||
<#elseif attribute.validators.options?? && attribute.validators.options.options??>
|
<#elseif attribute.validators.options?? && attribute.validators.options.options??>
|
||||||
<#assign options=attribute.validators.options.options>
|
<#assign options=attribute.validators.options.options>
|
||||||
|
<#else>
|
||||||
|
<#assign options=[]>
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
<#if options??>
|
|
||||||
<#list options as option>
|
<#list options as option>
|
||||||
<div class="${classDiv}">
|
<div class="${classDiv}">
|
||||||
<input type="${inputType}" id="${attribute.name}-${option}" name="${attribute.name}" value="${option}" class="${classInput}"
|
<input type="${inputType}" id="${attribute.name}-${option}" name="${attribute.name}" value="${option}" class="${classInput}"
|
||||||
|
@ -186,7 +188,6 @@
|
||||||
<label for="${attribute.name}-${option}" class="${classLabel}<#if attribute.readOnly> ${properties.kcInputClassRadioCheckboxLabelDisabled!}</#if>"><@selectOptionLabelText attribute=attribute option=option/></label>
|
<label for="${attribute.name}-${option}" class="${classLabel}<#if attribute.readOnly> ${properties.kcInputClassRadioCheckboxLabelDisabled!}</#if>"><@selectOptionLabelText attribute=attribute option=option/></label>
|
||||||
</div>
|
</div>
|
||||||
</#list>
|
</#list>
|
||||||
</#if>
|
|
||||||
</#macro>
|
</#macro>
|
||||||
|
|
||||||
<#macro selectOptionLabelText attribute option>
|
<#macro selectOptionLabelText attribute option>
|
||||||
|
|
Loading…
Reference in a new issue