webwork/src/resources/web/template/xhtml selectmap.jsp,1.3,1.4

Update of /cvsroot/opensymphony/webwork/src/resources/web/template/xhtml
In directory sc8-pr-cvs1:/tmp/cvs-serv15929

Modified Files:
	selectmap.jsp 
Log Message:
Fixes the problem when an object in list had method getParameters
as described in issue WW-177

Index: selectmap.jsp
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/resources/web/template/xhtml/selectmap.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- selectmap.jsp	27 Aug 2002 04:36:30 -0000	1.3
+++ selectmap.jsp	10 Nov 2003 23:33:39 -0000	1.4
@@ -34,36 +34,33 @@
 <%@ taglib uri="webwork" prefix="webwork" %>
 <%@ include file="controlheader.jsp" %>
 <select name="<webwork:property value="parameters['name']"/>"
-      <webwork:property value="parameters['disabled']">
-         <webwork:if test="parameters['disabled'] == true">disabled="disabled"</webwork:if>
-      </webwork:property>
-      <webwork:property value="parameters['tabindex']">
-         <webwork:if test=".">tabindex="<webwork:property value="."/>"</webwork:if>
-      </webwork:property>
-      <webwork:property value="parameters['onchange']">
-         <webwork:if test=".">onchange="<webwork:property value="."/>"</webwork:if>
-      </webwork:property>
-      <webwork:property value="parameters['size']">
-         <webwork:if test=".">size="<webwork:property value="."/>"</webwork:if>
-      </webwork:property>
-      <webwork:property value="parameters['multiple']">
-         <webwork:if test="parameters['multiple'] == true">multiple="multiple"</webwork:if>
-      </webwork:property>
-      <webwork:property value="parameters['id']">
-         <webwork:if test=".">id="<webwork:property value="."/>"</webwork:if>
-      </webwork:property>
+  <webwork:if test="parameters['disabled'] == true">disabled="disabled"</webwork:if>
+  <webwork:push value="parameters['tabindex']">
+    <webwork:if test=".">tabindex="<webwork:property value="."/>"</webwork:if>
+  </webwork:push>
+  <webwork:push value="parameters['onchange']">
+    <webwork:if test=".">onchange="<webwork:property value="."/>"</webwork:if>
+  </webwork:push>
+  <webwork:push value="parameters['size']">
+    <webwork:if test=".">size="<webwork:property value="."/>"</webwork:if>
+  </webwork:push>
+  <webwork:if test="parameters['multiple'] == true">multiple="multiple"</webwork:if>
+  <webwork:push value="parameters['id']">
+    <webwork:if test=".">id="<webwork:property value="."/>"</webwork:if>
+  </webwork:push>
 >
-   <webwork:if test="parameters['headerKey'] != null && parameters['headerValue'] != null">
-      <option value="<webwork:property value="parameters['headerKey']"/>">
-         <webwork:property value="parameters['headerValue']"/>
-      </option>
-   </webwork:if>
-   <webwork:iterator value="parameters['list']">
-      <option value="<webwork:property value="{parameters['listKey']}"/>"
-         <webwork:if test="{memberOf(parameters['nameValue'], {parameters['listKey']})} == true">selected="selected"</webwork:if>
-      >
-         <webwork:property value="{parameters['listValue']}"/>
-      </option>
-   </webwork:iterator>
+<webwork:if test="parameters['headerKey'] != null && parameters['headerValue'] != null">
+   <option value="<webwork:property value="parameters['headerKey']"/>">
+      <webwork:property value="parameters['headerValue']"/>
+   </option>
+</webwork:if>
+<webwork:push value="parameters['listKey']">
+<webwork:iterator value="parameters['list']">
+ <option value="<webwork:property value="{..}"/>"
+ <webwork:if test="../../memberOf(../../parameters['nameValue'], {..}) == true">selected="selected"</webwork:if>>
+ <webwork:property value="{../../parameters['listValue']}"/>
+ </option>
+</webwork:iterator>
+</webwork:push>
 </select>
 <%@ include file="controlfooter.jsp" %>




-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/