Author: jonesde
Date: Wed Dec 6 16:03:07 2006
New Revision: 483295
URL: http://svn.apache.org/viewvc?view=rev&rev=483295
Log:
A few cleanups to resolve some errors found while testing/running this
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
Modified:
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
URL:
http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl?view=diff&rev=483295&r1=483294&r2=483295
==============================================================================
---
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
(original)
+++
incubator/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
Wed Dec 6 16:03:07 2006
@@ -60,11 +60,16 @@
<hr/>
<#list entitiesList as entity>
<#if forstatic>
- <#assign encodeURL = response.encodeURL(controlPath +
"entityref_main#" + entity)>
- <a href="${encodeURL}" target="entityFrame"
class='listtext'>${entity}</a>
+ <#assign encodeURL = response.encodeURL(controlPath +
"entityref_main#" + entity.entityName)>
+ <a href="${encodeURL}" target="entityFrame"
class='listtext'>${entity.entityName}</a>
<#else>
- <#assign encodeURL = response.encodeURL(controlPath +
"/view/entityref_main#" + entity + url)>
- <a href="${encodeURL}" target="entityFrame"
class='listtext'>${entity}</a>
+ <#if entity.url?has_content>
+ <#assign encodeURL = response.encodeURL(controlPath +
"/view/entityref_main#" + entity.entityName)>
+ <#else/>
+ <#-- I don't know about this entity.url stuff, but
before cleaning things up here that is where the undefined url variable was -->
+ <#assign encodeURL = response.encodeURL(controlPath +
"/view/entityref_main#" + entity.entityName + entity.url)>
+ </#if>
+ <a href="${encodeURL}" target="entityFrame"
class='listtext'>${entity.entityName}</a>
</#if>
<br/>
</#list>
