- Revision
- 738
- Author
- mauro
- Date
- 2008-06-18 18:18:46 -0500 (Wed, 18 Jun 2008)
Log Message
WAFFLE-80: Renamed function asNameables to asNameableValues to underline the values content, with the addition of the name decoration.
Modified Paths
Diff
Modified: trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl (737 => 738)
--- trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-06-18 21:33:15 UTC (rev 737) +++ trunk/examples/freemarker-example/src/main/webapp/people/edit.ftl 2008-06-18 23:18:46 UTC (rev 738) @@ -52,7 +52,7 @@ <p class="fieldRow"> <label for="" <@w.hidden "person.friends" ""/> - <@w.selectMultiple "person.friends" w.asNameables(controller.getPeople(),"id","firstName") w.asValues(person.getFriends(),"id") "size='5'"/> + <@w.selectMultiple "person.friends" w.asNameableValues(controller.getPeople(),"id","firstName") w.asValues(person.getFriends(),"id") "size='5'"/> </p> <p class="fieldRow"> <label for="" @@ -69,7 +69,7 @@ </p> <p class="fieldRow"> <label for="" - <@w.selectSingle "person.type" w.asNameables(controller.getTypes(),"name()","name()") person.getType()/> + <@w.selectSingle "person.type" w.asNameableValues(controller.getTypes(),"name()","name()") person.getType()/> </p> <p class="fieldRow"> <label for="" wizard:</label>
Modified: trunk/waffle-resources/src/main/resources/ftl/waffle/form.ftl (737 => 738)
--- trunk/waffle-resources/src/main/resources/ftl/waffle/form.ftl 2008-06-18 21:33:15 UTC (rev 737) +++ trunk/waffle-resources/src/main/resources/ftl/waffle/form.ftl 2008-06-18 23:18:46 UTC (rev 738) @@ -33,36 +33,36 @@ </#function> <#-- - * Converts a sequence of elements to a sequence of nameables hashes with name and value fields + * Converts a sequence of elements to a sequence of values, ie obtained from the value fields * * @param elements the sequence of elements to convert * @param valueField the name of the value field in the input element (defaults to "value") - * @param nameField the name of the name field in the input element (defaults to "name") - * @return A sequence of nameables hashes + * @return A sequence of values --> -<#function asNameables elements valueField="value" nameField="name"> +<#function asValues elements valueField="value"> <#assign result = []> <#list elements as element> <#assign value='${element["${valueField}"]!element}'> - <#assign name='${element["${nameField}"]!element}'> - <#assign nameable = {"value":"${value}", "name":"${name}"}> - <#assign result=result+[nameable]> + <#assign result=result+[value]> </#list> <#return result> </#function> <#-- - * Converts a sequence of elements to a sequence of values obtained from the value fields + * Converts a sequence of elements to a sequence of nameable values, ie hashes with name and value fields * * @param elements the sequence of elements to convert * @param valueField the name of the value field in the input element (defaults to "value") - * @return A sequence of values + * @param nameField the name of the name field in the input element (defaults to "name") + * @return A sequence of nameables hashes --> -<#function asValues elements valueField="value"> +<#function asNameableValues elements valueField="value" nameField="name"> <#assign result = []> <#list elements as element> <#assign value='${element["${valueField}"]!element}'> - <#assign result=result+[value]> + <#assign name='${element["${nameField}"]!element}'> + <#assign nameable = {"value":"${value}", "name":"${name}"}> + <#assign result=result+[nameable]> </#list> <#return result> </#function>
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/nameables.ftl (737 => 738)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/nameables.ftl 2008-06-18 21:33:15 UTC (rev 737) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/nameables.ftl 2008-06-18 23:18:46 UTC (rev 738) @@ -1,9 +1,9 @@ <#import "/ftl/waffle/form.ftl" as w> -<#assign nameables=w.asNameables(controller.getNameables()) /> +<#assign nameables=w.asNameableValues(controller.getNameables()) /> <#list nameables as n> ${n.value}:${n.name} </#list> -<#assign displayables=w.asNameables(controller.getDisplayables(), "id", "display")/> +<#assign displayables=w.asNameableValues(controller.getDisplayables(), "id", "display")/> <#list nameables as n> ${n.value}:${n.name} </#list>
Modified: trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl (737 => 738)
--- trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl 2008-06-18 21:33:15 UTC (rev 737) +++ trunk/waffle-resources/src/test/java/org/codehaus/waffle/resources/ftl/select.ftl 2008-06-18 23:18:46 UTC (rev 738) @@ -1,8 +1,8 @@ <#import "/ftl/waffle/form.ftl" as w> <@w.selectSingle "values" controller.getValues() "one"/> <@w.selectSingle "nameables" controller.getNameables() "two"/> -<@w.selectSingle "types" w.asNameables(controller.getTypes(), "name()", "name()") controller.getSelectedType() /> +<@w.selectSingle "types" w.asNameableValues(controller.getTypes(), "name()", "name()") controller.getSelectedType() /> <@w.selectMultiple "values" controller.getValues() controller.getSelectedValues() /> <@w.selectMultiple "nameables" controller.getNameables() controller.getSelectedValues() /> -<@w.selectMultiple "displayables" w.asNameables(controller.getDisplayables(),"id","display") controller.getSelectedValues() /> -<@w.selectMultiple "displayablesAsValues" w.asNameables(controller.getDisplayables(),"id","display") w.asValues(controller.getSelectedDisplayables(),"id") /> \ No newline at end of file +<@w.selectMultiple "displayables" w.asNameableValues(controller.getDisplayables(),"id","display") controller.getSelectedValues() /> +<@w.selectMultiple "displayablesAsValues" w.asNameableValues(controller.getDisplayables(),"id","display") w.asValues(controller.getSelectedDisplayables(),"id") /> \ No newline at end of file
To unsubscribe from this list please visit:
