From cecc5375d2a72f63b3e2098adf8792ecdafe79d8 Mon Sep 17 00:00:00 2001
From: Rainer Hermanns <hermanns@apache.org>
Date: Wed, 22 Apr 2009 14:05:52 +0000
Subject: [PATCH] WW-2809 doubleselect ignores preselection of a multiple
 subselect

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@767529 13f79535-47bb-0310-9956-ffa450edef68
---
 .../template/simple/doubleselect.ftl          | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl
index a13f4e033..f3d98a144 100644
--- a/core/src/main/resources/template/simple/doubleselect.ftl
+++ b/core/src/main/resources/template/simple/doubleselect.ftl
@@ -121,13 +121,22 @@
 
         for (i = 0; i < ${parameters.id}Group[x].length; i++) {
             ${parameters.id}Temp.options[i] = new Option(${parameters.id}Group[x][i].text, ${parameters.id}Group[x][i].value);
-            <#if parameters.doubleNameValue??>
-            	if (${parameters.id}Temp.options[i].value == '${parameters.doubleNameValue}') {
-            		${parameters.id}Temp.options[i].selected = true;
-            		selected = true;
-            	}
-            </#if>
-        }
+            <#if parameters.doubleNameValue?exists>
+                   <#if parameters.doubleMultiple?exists>
+                         for (j = 0; j < ${parameters.doubleNameValue}.length; j++) {
+                             if (${parameters.id}Temp.options[i].value == ${parameters.doubleNameValue}[j]) {
+                               ${parameters.id}Temp.options[i].selected = true;
+                                selected = true;
+                             }
+                        }
+                   <#else>
+                        if (${parameters.id}Temp.options[i].value == '${parameters.doubleNameValue}') {
+                            ${parameters.id}Temp.options[i].selected = true;
+                            selected = true;
+                        }
+                   </#if>
+             </#if>
+         }
 
         if ((${parameters.id}Temp.options.length > 0) && (! selected)) {
            	${parameters.id}Temp.options[0].selected = true;