svn commit: r1706577 - /ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java

[deepak]

Author: deepak
Date: Sat Oct  3 13:16:46 2015
New Revision: 1706577

URL: http://svn.apache.org/viewvc?rev=1706577&view=rev
Log:
(OFBIZ-6212) Fixed accounting report PDF export issue, it was throwing FOP 
exception. It was due to empty description string, if description is empty then 
makeHyperlinkString does not call the makeHyperlinkString macro to render the 
hyper link and due to this fo:table-cell is render without fo:block and its not 
a valid syntax of fo:table-cell.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1706577&r1=1706576&r2=1706577&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
 (original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/renderer/macro/MacroFormRenderer.java
 Sat Oct  3 13:16:46 2015
@@ -3072,7 +3072,7 @@ public final class MacroFormRenderer imp
 
     public void makeHyperlinkString(Appendable writer, String linkStyle, 
String targetType, String target, Map<String, String> parameterMap, String 
description, String confirmation, ModelFormField modelFormField, 
HttpServletRequest request, HttpServletResponse response, Map<String, Object> 
context,
             String targetWindow) throws IOException {
-        if (UtilValidate.isNotEmpty(description) || 
UtilValidate.isNotEmpty(request.getAttribute("image"))) {
+        if (description != null || 
UtilValidate.isNotEmpty(request.getAttribute("image"))) {
             StringBuilder linkUrl = new StringBuilder();
             WidgetWorker.buildHyperlinkUrl(linkUrl, target, targetType, 
parameterMap, null, false, false, true, request, response, context);
             String event = "";