svn commit: r1738236 - in /ofbiz/branches/release15.12: ./ framework/webtools/webapp/webtools/entity/EntityRefList.ftl

Author: jleroux
Date: Fri Apr  8 12:06:12 2016
New Revision: 1738236

URL: http://svn.apache.org/viewvc?rev=1738236&view=rev
Log:
"Applied fix from trunk for revision: 1738235  "
------------------------------------------------------------------------
r1738235 | jleroux | 2016-04-08 13:54:01 +0200 (ven. 08 avr. 2016) | 7 lignes

A patch from Kongrath Suankaewmanee for "Error in entity reference chart for static in webtools" https://issues.apache.org/jira/browse/OFBIZ-6995

I found the error when I try to use entity reference chart for static in webtools,
https://localhost:8443/webtools/control/entityref?forstatic=true
and choose one from the list of left side and the error appear on right hand side.
It's work without error for "Enitity Packages" list but doesn't for "Entities - Alphabetical" list.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/framework/webtools/webapp/webtools/entity/EntityRefList.ftl

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  8 12:06:12 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1737156,1737440
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1737156,1737440,1738235

Modified: ofbiz/branches/release15.12/framework/webtools/webapp/webtools/entity/EntityRefList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/webtools/webapp/webtools/entity/EntityRefList.ftl?rev=1738236&r1=1738235&r2=1738236&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/webtools/webapp/webtools/entity/EntityRefList.ftl (original)
+++ ofbiz/branches/release15.12/framework/webtools/webapp/webtools/entity/EntityRefList.ftl Fri Apr  8 12:06:12 2016
@@ -54,7 +54,7 @@ under the License.
                 <div class="section-header">${uiLabelMap.WebtoolsEntityPackages}</div>
                 <#list packageNames as packageName>
                     <#if forstatic>
-                        <a href="entityref_main#${packageName}" target="entityFrame">${packageName}</a><br />
+                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
                     <#else>
                         <a href="<@ofbizUrl>view/entityref_main#${packageName}</@ofbizUrl>" target="entityFrame">${packageName}</a><br />
                     </#if>
@@ -65,7 +65,7 @@ under the License.
                 <div class="section-header">${uiLabelMap.WebtoolsEntitiesAlpha}</div>
                 <#list entitiesList as entity>
                     <#if forstatic>
-                        <a href="<@ofbizUrl>entityref_main#${entity.entityName}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
+                        <a href="<@ofbizUrl>view/entityref_main?forstatic=true#${entity.entityName}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
                     <#else>
                         <a href="<@ofbizUrl>view/entityref_main#${entity.entityName}${entity.url!}</@ofbizUrl>" target="entityFrame">${entity.entityName}</a>
                     </#if>