Author: adrianc Date: Wed Jan 7 16:05:08 2009 New Revision: 732565 URL: http://svn.apache.org/viewvc?rev=732565&view=rev Log: Fixed a bug that was introduced in the Webtools JSP->bsh+ftl refactor, reported in https://issues.apache.org/jira/browse/OFBIZ-1259.
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Modified: ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy?rev=732565&r1=732564&r2=732565&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/WEB-INF/actions/entity/XmlDsDump.groovy Wed Jan 7 16:05:08 2009 @@ -178,8 +178,8 @@ } reader = delegator.getModelReader(); -entityNames = reader.getEntityNames() as TreeSet; -context.entityNames = entityNames; +modelEntities = reader.getEntityCache().values() as TreeSet; +context.modelEntities = modelEntities; if (tobrowser) { session.setAttribute("xmlrawdump_entitylist", passedEntityNames); Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl?rev=732565&r1=732564&r2=732565&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Wed Jan 7 16:05:08 2009 @@ -108,12 +108,17 @@ <table> <tr> <#assign entCount = 0> - <#assign check = parameters.checkAll?default("false")> - <#list entityNames as curEntityName> + <#assign checkAll = parameters.checkAll?default("false")> + <#list modelEntities as modelEntity> <#if entCount % 3 == 0> </tr><tr> </#if> <#assign entCount = entCount + 1> + <#assign check = checkAll/> + <#if checkAll == "true" && modelEntity.getClass().getName() == "org.ofbiz.entity.model.ModelViewEntity"> + <#assign check = "false"/> + </#if> + <#assign curEntityName = modelEntity.getEntityName()/> <td><input type="checkbox" name="entityName" value="${curEntityName}"<#if check="true"> checked="checked"</#if>/>${curEntityName}</td> </#list> </tr>