svn commit: r1395296 - /ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl

[jl...@apache.org]

Author: jleroux
Date: Sun Oct  7 13:24:44 2012
New Revision: 1395296

URL: http://svn.apache.org/viewvc?rev=1395296&view=rev
Log:
While testing for https://issues.apache.org/jira/browse/OFBIZ-5047 with trunk (instead of 10.04) I got an issue introduced by http://svn.apache.org/viewvc?view=revision&revision=950764 but actually the FTL code did not make any sense, why using a static call to isNotEmpty when you have ?has_content?


Modified:
    ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl

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=1395296&r1=1395295&r2=1395296&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl (original)
+++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.ftl Sun Oct  7 13:24:44 2012
@@ -41,10 +41,10 @@ under the License.
 
 <#if security.hasPermission("ENTITY_MAINT", session)>
   <h2>${uiLabelMap.WebtoolsResults}:</h2>
-  <#if Static["org.ofbiz.base.util.UtilValidate"].isNotEmpty(parameters.filename) && (numberOfEntities?number > 0)>
+  <#if parameters.filename?has_content && (numberOfEntities?number > 0)>
     <p>${uiLabelMap.WebtoolsWroteXMLForAllDataIn}</p>
     <p>${uiLabelMap.WebtoolsWroteNRecordsToXMLFile}</p>
-  <#elseif Static["org.ofbiz.base.util.UtilValidate"].isNotEmpty(parameters.outpath) && (numberOfEntities?number > 0)>
+  <#elseif parameters.outpath?has_content && (numberOfEntities?number > 0)>
     <#list results as result>
       <p>${result}</p>
     </#list>