From 98fd17dd52e96b1a7ab5fdf03da60d09ceffa99c Mon Sep 17 00:00:00 2001 From: Thomas Bayen Date: Fri, 22 Feb 2013 14:30:33 +0100 Subject: [PATCH 1/2] IDEMPIERE-655 Swing: No report without printformat window access --- org.adempiere.ui.swing/src/org/compiere/print/Viewer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java index 2f147d2184..c6eaaf50f5 100644 --- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java +++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java @@ -467,7 +467,7 @@ public class Viewer extends CFrame } // IDEMPIERE-297 - Check for Table Access and Window Access for New Report if ( MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) - && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT)) + && (MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE)) { StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(m_ctx, "NewReport")).append(" **"); KeyNamePair pp = new KeyNamePair(-1, sb.toString()); From e326c33f88b32dd4a4cac84bc762462630cd42a1 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 6 Mar 2013 17:06:48 -0500 Subject: [PATCH 2/2] IDEMPIERE-655 No report without printformat window access / Implement same solution for zk --- .../src/org/adempiere/webui/panel/action/ReportAction.java | 2 +- .../WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java index a805ae5ad4..234eb3068f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/action/ReportAction.java @@ -404,7 +404,7 @@ public class ReportAction implements EventListener log.log(Level.SEVERE, e.getLocalizedMessage(), e); } - if (MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT)) + if (MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE) { StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(Env.getCtx(), "NewReport")).append(" **"); pp = new KeyNamePair(-1, sb.toString()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java index 4350835c59..fcb4ea6ce7 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewer.java @@ -606,7 +606,7 @@ public class ZkReportViewer extends Window implements EventListener, ITab } // IDEMPIERE-297 - Check for Table Access and Window Access for New Report if ( MRole.getDefault().isTableAccess(MPrintFormat.Table_ID, false) - && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT)) + && MRole.getDefault().getWindowAccess(WINDOW_PRINTFORMAT) == Boolean.TRUE) { StringBuffer sb = new StringBuffer("** ").append(Msg.getMsg(Env.getCtx(), "NewReport")).append(" **"); KeyNamePair pp = new KeyNamePair(-1, sb.toString());