From 81257ae42c01e089cb2beb14ee46e71cfcfcd3d6 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Tue, 28 Jul 2009 04:44:53 +0000 Subject: [PATCH] https://sourceforge.net/tracker/?func=detail&aid=2804027&group_id=176962&atid=955896 - fixed a potential NPE in ReportEngine - change the single ZK_REPORT_DEFAULT_OUTPUT_TYPE to ZK_REPORT_TABLE_OUTPUT_TYPE and ZK_REPORT_FORM_OUTPUT_TYPE. This changes allow administrator to set different default output type for form and table report. The default remain as PDF if the configuration parameter is not set. --- base/src/org/compiere/print/ReportEngine.java | 2 +- .../src/org/adempiere/webui/window/ZkReportViewer.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/base/src/org/compiere/print/ReportEngine.java b/base/src/org/compiere/print/ReportEngine.java index f9c5fb7c7f..7b4353d1f0 100644 --- a/base/src/org/compiere/print/ReportEngine.java +++ b/base/src/org/compiere/print/ReportEngine.java @@ -291,7 +291,7 @@ public class ReportEngine implements PrintServiceAttributeListener */ public Properties getCtx() { - return m_layout.getCtx(); + return getLayout().getCtx(); } // getCtx /** diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 433cc32923..e0be247e21 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -188,7 +188,9 @@ public class ZkReportViewer extends Window implements EventListener { toolBar.appendChild(new Separator("vertical")); //set default type - String type = MSysConfig.getValue("ZK_REPORT_DEFAULT_OUTPUT_TYPE"); + String type = m_reportEngine.getPrintFormat().isForm() + ? MSysConfig.getValue("ZK_REPORT_FORM_OUTPUT_TYPE") + : MSysConfig.getValue("ZK_REPORT_TABLE_OUTPUT_TYPE"); if ("PDF".equals(type)) previewType.setSelectedIndex(0); else if ("HTML".equals(type))