Author: sletellier Date: 2011-07-05 17:04:27 +0200 (Tue, 05 Jul 2011) New Revision: 1054 Url: http://nuiton.org/repositories/revision/wikitty/1054 Log: - Rename selectAssociation tag - Add multiple selection option Added: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl Removed: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation-close.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectAssociationBean.java 2011-07-05 15:04:27 UTC (rev 1054) @@ -27,6 +27,7 @@ protected String descField; protected int size; + protected Boolean multiple; public SelectAssociationBean(ValueStack stack, HttpServletRequest request, HttpServletResponse response) { @@ -43,8 +44,13 @@ size = 1; } - // add parametter - addParameter("size", size); + // add parameters + addParameter("selectSize", size); + + if (multiple == null) { + multiple = false; + } + addParameter("multiple", multiple); List<Option> listOption = new LinkedList<Option>(); Deleted: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl 2011-07-05 15:04:27 UTC (rev 1054) @@ -1,16 +0,0 @@ -<#if parameters.included?? && parameters.included==true > -<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> -<select -<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> - size="${parameters.size}" -<#-- <#if parameters.multiple?? && parameters.multiple==true >--> - multiple -<#-- </#if> --> - > -<#assign optionKeys = parameters.value><#t/> - <#list optionKeys as optionKey> - <option value="${optionKey.valeur}"> - ${optionKey.description} </option> - </#list> -</select><#t/> -</#if> \ No newline at end of file Copied: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl (from rev 1052, trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectAssociation.ftl) =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl (rev 0) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2011-07-05 15:04:27 UTC (rev 1054) @@ -0,0 +1,16 @@ +<#if parameters.included?? && parameters.included==true > +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<select +<#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> + size="${parameters.selectSize}" +<#if parameters.multiple?? && parameters.multiple> + multiple + </#if> + > +<#assign optionKeys = parameters.value><#t/> + <#list optionKeys as optionKey> + <option value="${optionKey.valeur}"> + ${optionKey.description} </option> + </#list> +</select><#t/> +</#if> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:02:52 UTC (rev 1053) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-05 15:04:27 UTC (rev 1054) @@ -132,6 +132,12 @@ <rtexprvalue>true</rtexprvalue> <required>true</required> </attribute> + <attribute> + <description><![CDATA[to enable multiselect]]></description> + <name>multiple</name> + <rtexprvalue>true</rtexprvalue> + <required>false</required> + </attribute> </tag>