Author: hermanns
Date: Tue Apr 1 04:01:22 2008
New Revision: 643359
URL: http://svn.apache.org/viewvc?rev=643359&view=rev
Log:
WW-2465
Dynamic trees in the dojo plugin causes a freemarker error if the child
property returns null
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl?rev=643359&r1=643358&r2=643359&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/treenode-include.ftl
Tue Apr 1 04:01:22 2008
@@ -21,7 +21,7 @@
*/
-->
<div dojoType="struts:StrutsTreeNode"
title="${stack.findValue(parameters.nodeTitleProperty)}"
id="${stack.findValue(parameters.nodeIdProperty)}">
-<#list stack.findValue(parameters.childCollectionProperty.toString()) as child>
+<#list stack.findValue(parameters.childCollectionProperty.toString())! as
child>
${stack.push(child)}
<#include "/${parameters.templateDir}/ajax/treenode-include.ftl" />
<#assign oldNode = stack.pop() /> <#-- pop the node off of the stack, but
don't show it -->
