From afca73d7b86dbb89e4d3767790bc409fddafce98 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Tue, 15 Jul 2014 15:10:52 -0500 Subject: [PATCH] IDEMPIERE-1673 In new state of record. click to print and export throws exception --- .../webui/adwindow/ADWindowToolbar.java | 20 +++++++++++++++++++ .../adwindow/AbstractADWindowContent.java | 19 ++++++++++-------- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java index ea8278f2c8..588dcb64e0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java @@ -523,6 +523,26 @@ public class ADWindowToolbar extends FToolbar implements EventListener { btnCustomize.setDisabled(!enabled); } + + public void enableArchive(boolean enabled) + { + btnArchive.setDisabled(!enabled); + } + + public void enableZoomAcross(boolean enabled) + { + btnZoomAcross.setDisabled(!enabled); + } + + public void enableActiveWorkflows(boolean enabled) + { + btnActiveWorkflows.setDisabled(!enabled); + } + + public void enableRequests(boolean enabled) + { + btnRequests.setDisabled(!enabled); + } public void lock(boolean locked) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index cb8e9d9f1a..dde8406f73 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -1081,7 +1081,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements { ADTabpanel adtab = (ADTabpanel) event.getTarget(); if (adtab == adTabbox.getSelectedTabpanel()) { - toolbar.enableProcessButton(adtab.getToolbarButtons().size() > 0); + toolbar.enableProcessButton(adtab.getToolbarButtons().size() > 0 && !adTabbox.getSelectedGridTab().isNew()); toolbar.dynamicDisplay(); } } @@ -1271,7 +1271,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements toolbar.lock(adTabbox.getSelectedGridTab().isLocked()); } - toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted()); + toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted() && !adTabbox.getSelectedGridTab().isNew()); //Deepak-Enabling customize button IDEMPIERE-364 if(!(adTabbox.getSelectedTabpanel() instanceof ADSortTab)) @@ -1596,8 +1596,15 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements adTabbox.evaluate(e); } - toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted() && !adTabbox.getSelectedGridTab().isNew()); - toolbar.enableReport(true); + boolean isNewRow = adTabbox.getSelectedGridTab().getRowCount() == 0 || adTabbox.getSelectedGridTab().isNew(); + toolbar.enableProcessButton(!isNewRow); + toolbar.enableArchive(!isNewRow); + toolbar.enableZoomAcross(!isNewRow); + toolbar.enableActiveWorkflows(!isNewRow); + toolbar.enableRequests(!isNewRow); + + toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted() && !isNewRow); + toolbar.enableReport(!isNewRow); toolbar.enableExport(!adTabbox.getSelectedGridTab().isSortTab()); toolbar.enableFileImport(!changed && !adTabbox.getSelectedGridTab().isSortTab() && adTabbox.getSelectedGridTab().isInsertRecord()); @@ -1741,8 +1748,6 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements breadCrumb.enableLastNavigation(adTabbox.getSelectedGridTab().getCurrentRow() + 1 < adTabbox.getSelectedGridTab().getRowCount()); toolbar.enableTabNavigation(breadCrumb.hasParentLink(), adTabbox.getSelectedDetailADTabpanel() != null); toolbar.enableIgnore(true); - toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted()); - toolbar.enableReport(true); if (adTabbox.getSelectedGridTab().isSingleRow()) { if (adTabbox.getSelectedTabpanel().isGridView()) @@ -1789,8 +1794,6 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements breadCrumb.enableLastNavigation(adTabbox.getSelectedGridTab().getCurrentRow() + 1 < adTabbox.getSelectedGridTab().getRowCount()); toolbar.enableTabNavigation(false); toolbar.enableIgnore(true); - toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted()); - toolbar.enableReport(true); } else {