Author: sletellier Date: 2011-07-06 16:15:34 +0200 (Wed, 06 Jul 2011) New Revision: 1063 Url: http://nuiton.org/repositories/revision/wikitty/1063 Log: Debug select tag Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl trunk/wikitty-struts/src/main/tld/wikitty-struts.tld Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-07-06 12:26:44 UTC (rev 1062) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/SelectBean.java 2011-07-06 14:15:34 UTC (rev 1063) @@ -33,7 +33,7 @@ protected Integer size; protected String descField; protected Collection<Wikitty> wikittyValues; - protected Collection<BusinessEntity> entityValues; + protected Collection<? extends BusinessEntity> entityValues; @@ -115,7 +115,7 @@ } } - addParameter("values", resultList); + addParameter("value", resultList); } @@ -154,11 +154,11 @@ this.wikittyValues = wikittyValues; } - public Collection<BusinessEntity> getEntityValues() { + public Collection<? extends BusinessEntity> getEntityValues() { return entityValues; } - public void setEntityValues(Collection<BusinessEntity> entityValues) { + public void setEntityValues(Collection<? extends BusinessEntity> entityValues) { this.entityValues = entityValues; } } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java 2011-07-06 12:26:44 UTC (rev 1062) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/tag/SelectTag.java 2011-07-06 14:15:34 UTC (rev 1063) @@ -17,7 +17,7 @@ protected Integer size; protected String descField; protected Collection<Wikitty> wikittyValues; - protected Collection<BusinessEntity> entityValues; + protected Collection<? extends BusinessEntity> entityValues; /** * @@ -72,11 +72,11 @@ this.wikittyValues = wikittyValues; } - public Collection<BusinessEntity> getEntityValues() { + public Collection<? extends BusinessEntity> getEntityValues() { return entityValues; } - public void setEntityValues(Collection<BusinessEntity> entityValues) { + public void setEntityValues(Collection<? extends BusinessEntity> entityValues) { this.entityValues = entityValues; } Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl 2011-07-06 12:26:44 UTC (rev 1062) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-select.ftl 2011-07-06 14:15:34 UTC (rev 1063) @@ -1,9 +1,8 @@ -<#if parameters.included?? && parameters.included==true > -<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> +<#include "/${parameters.templateDir}/${parameters.theme}/ws-label-commons.ftl" /> <select <#include "/${parameters.templateDir}/${parameters.theme}/ws-commons.ftl" /> size="${parameters.selectSize}"> -<#assign optionKeys = parameters.values><#t/> +<#assign optionKeys = parameters.value/><#t/> <#list optionKeys as optionKey><#t/> <option value="${optionKey.valeur}" <#t/> <#if optionKey.valeur==parameters.value > @@ -11,5 +10,4 @@ </#if> <#t/> > ${optionKey.description} </option> </#list> -</select><#t/> -</#if> \ No newline at end of file +</select><#t/> \ No newline at end of file Modified: trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl =================================================================== --- trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2011-07-06 12:26:44 UTC (rev 1062) +++ trunk/wikitty-struts/src/main/resources/template/wikitty/ws-selectassociation.ftl 2011-07-06 14:15:34 UTC (rev 1063) @@ -7,7 +7,7 @@ multiple </#if>

-<#assign optionKeys = parameters.value><#t/> +<#assign optionKeys = parameters.value/><#t/> <#list optionKeys as optionKey> <option value="${optionKey.valeur}"> ${optionKey.description} </option> Modified: trunk/wikitty-struts/src/main/tld/wikitty-struts.tld =================================================================== --- trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-06 12:26:44 UTC (rev 1062) +++ trunk/wikitty-struts/src/main/tld/wikitty-struts.tld 2011-07-06 14:15:34 UTC (rev 1063) @@ -127,7 +127,7 @@ <rtexprvalue>true</rtexprvalue> </attribute> <attribute> - <description><![CDATA[the name of the field that have to be specialize, it will be the name of the html element]]></description> + <description><![CDATA[the name of the field that have to be specialize]]></description> <name>fqFieldName</name> <rtexprvalue>true</rtexprvalue> <required>true</required>