You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2009/02/10 06:45:41 UTC
svn commit: r742860 - in /ofbiz/trunk:
framework/webtools/webapp/webtools/entity/EntityRefList.ftl
framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
themes/bluelight/includes/appbar.ftl
Author: jonesde
Date: Tue Feb 10 05:45:40 2009
New Revision: 742860
URL: http://svn.apache.org/viewvc?rev=742860&view=rev
Log:
Removed response.encodeUrl and funny URL patterns not using @ofbizUrl; resolves issues between those and the new general html encoding
Modified:
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
ofbiz/trunk/themes/bluelight/includes/appbar.ftl
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl?rev=742860&r1=742859&r2=742860&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefList.ftl Tue Feb 10 05:45:40 2009
@@ -35,29 +35,19 @@
<body>
<div class='listtext'>
<#if !forstatic>
- <#assign encodeURLMain = response.encodeURL(controlPath + "/main")>
- <#assign encodeURLRefMain = response.encodeURL(controlPath + "/view/entityref_main")>
- <#assign encodeURLCheckDb = response.encodeURL(controlPath + "/view/checkdb")>
- <#assign encodeURLModelInduceFromDb = response.encodeURL(controlPath + "/view/ModelInduceFromDb")>
- <a href="${encodeURLMain}" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</A><BR>
- <a href="${encodeURLRefMain}" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</A><BR>
- <a href="${encodeURLCheckDb}" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</A>
+ <a href="<@o...@ofbizUrl>" target='main'>${uiLabelMap.WebtoolsPopupWebToolsMain}</A><BR>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsEntityReferenceMainPage}</A><BR>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${uiLabelMap.WebtoolsCheckUpdateDatabase}</A>
<hr/>
- <#--
- <#assign encodeURLModelWriter = response.encodeURL(controlPath + "/ModelWriter")>
- <#assign encodeURLModelWriterSaveFile = response.encodeURL(controlPath + "/ModelWriter?savetofile=true")>
- <#assign encodeURLModelGroupWriter = response.encodeURL(controlPath + "/ModelGroupWriter")>
- <#assign encodeURLModelGroupWriterSaveFile = response.encodeURL(controlPath + "/ModelGroupWriter?savetofile=true")>
- -->
<#-- want to leave these out because they are only working so-so, and cause people more problems that they solve, IMHO
- <a href="${encodeURLModelWriter}" target='_blank'>Generate Entity Model XML (all in one)</A><BR>
- <a href="${encodeURLModelWriterSaveFile}<%=response.encodeURL(controlPath + "/ModelWriter?savetofile=true")%>" target='_blank'>Save Entity Model XML to Files</A><BR>
+ <a href="<@o...@ofbizUrl>" target='_blank'>Generate Entity Model XML (all in one)</A><BR>
+ <a href="<@o...@ofbizUrl>" target='_blank'>Save Entity Model XML to Files</A><BR>
-->
<#-- this is not working now anyway...
- <a href="${encodeURLModelGroupWriter}<%=response.encodeURL(controlPath + "/ModelGroupWriter")%>" target='_blank'>Generate Entity Group XML</A><BR>
- <a href="${encodeURLModelGroupWriterSaveFile}<%=response.encodeURL(controlPath + "/ModelGroupWriter?savetofile=true")%>" target='_blank'>Save Entity Group XML to File</A><BR>
+ <a href="<@o...@ofbizUrl>" target='_blank'>Generate Entity Group XML</A><BR>
+ <a href="<@o...@ofbizUrl>" target='_blank'>Save Entity Group XML to File</A><BR>
-->
- <a href="${encodeURLModelInduceFromDb}" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</A><BR>
+ <a href="<@o...@ofbizUrl>" target='_blank'>${uiLabelMap.WebtoolsInduceModelXMLFromDatabase}</A><BR>
</#if>
<#if packageNames?has_content>
<hr/>
@@ -66,8 +56,7 @@
<#if forstatic>
<a href="entityref_main.html#${packageName}" target="entityFrame">${packageName}</a><br/>
<#else>
- <#assign encodeURL = response.encodeURL(controlPath + "/view/entityref_main#" + packageName)>
- <a href="${encodeURL}" target="entityFrame">${packageName}</a><br/>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${packageName}</a><br/>
</#if>
</#list>
</#if>
@@ -76,16 +65,9 @@
<div class="section-header">${uiLabelMap.WebtoolsEntitiesAlpha}</div>
<#list entitiesList as entity>
<#if forstatic>
- <#assign encodeURL = response.encodeURL(controlPath + "entityref_main#" + entity.entityName)>
- <a href="${encodeURL}" target="entityFrame">${entity.entityName}</a>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
<#else>
- <#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">${entity.entityName}</a>
+ <a href="<@o...@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
</#if>
<br/>
</#list>
Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl?rev=742860&r1=742859&r2=742860&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRefMain.ftl Tue Feb 10 05:45:40 2009
@@ -63,12 +63,10 @@
</div>
<div>${entity.title}
<#if !forstatic>
- <#assign encodeURL = response.encodeURL(controlPath + "/FindGeneric?entityName=" + entity.entityName + "&find=true&VIEW_SIZE=50&VIEW_INDEX=0")>
- <a target='main' href="${encodeURL}">[${uiLabelMap.WebtoolsViewData}]</a>
+ <a target='main' href="<@o...@ofbizUrl>">[${uiLabelMap.WebtoolsViewData}]</a>
</#if>
<#if !forstatic>
- <#assign encodeURL = response.encodeURL(controlPath + "/ArtifactInfo?name=" + entity.entityName + "&type=entity")>
- <a target='main' href="${encodeURL}">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
+ <a target='main' href="<@o...@ofbizUrl>">[${uiLabelMap.WebtoolsArtifactInfo}]</a>
</#if>
</div>
<#if entity.description?has_content &&
Modified: ofbiz/trunk/themes/bluelight/includes/appbar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/appbar.ftl?rev=742860&r1=742859&r2=742860&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/appbar.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/appbar.ftl Tue Feb 10 05:45:40 2009
@@ -51,7 +51,7 @@
<#assign thisURL = thisURL + "/control/main">
</#if>
<!-- <#if !selected>-->
- <li><a href="${response.encodeURL(thisURL + externalKeyParam)}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
+ <li><a href="${thisURL + externalKeyParam}" <#if uiLabelMap?exists> title="${uiLabelMap[display.description]}">${uiLabelMap[display.title]}<#else> title="${display.description}">${display.title}</#if></a></li>
<!-- </#if>-->
</#if>
</#list>