Skip to content

Commit 61a5ab9

Browse files
committed
fixed "formMultiSelect"/"formCheckboxes" FreeMarker macros to compare against actual field value (SPR-7721)
1 parent 3f7dccd commit 61a5ab9

File tree

1 file changed

+2
-2
lines changed
  • org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker

1 file changed

+2
-2
lines changed

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/freemarker/spring.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<@bind path/>
247247
<select multiple="multiple" id="${status.expression}" name="${status.expression}" ${attributes}>
248248
<#list options?keys as value>
249-
<#assign isSelected = contains(status.value?default([""]), value)>
249+
<#assign isSelected = contains(status.actualValue?default([""]), value)>
250250
<option value="${value?html}"<#if isSelected> selected="selected"</#if>>${options[value]?html}</option>
251251
</#list>
252252
</select>
@@ -289,7 +289,7 @@
289289
<@bind path/>
290290
<#list options?keys as value>
291291
<#assign id="${status.expression}${value_index}">
292-
<#assign isSelected = contains(status.value?default([""]), value)>
292+
<#assign isSelected = contains(status.actualValue?default([""]), value)>
293293
<input type="checkbox" id="${id}" name="${status.expression}" value="${value?html}"<#if isSelected> checked="checked"</#if> ${attributes}<@closeTag/>
294294
<label for="${id}">${options[value]?html}</label>${separator}
295295
</#list>

0 commit comments

Comments
 (0)