From f2cda463d12a133449568fb4a5151f091c7f049a Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Sat, 17 Jan 2015 10:48:54 -0500 Subject: [PATCH] IDEMPIERE-2404 Position in first pending node in Setup Wizard / when opening Setup Wizard the first time the context help of the node is not shown --- org.adempiere.base/src/org/compiere/model/SystemIDs.java | 1 + .../src/org/adempiere/webui/apps/form/WSetupWizard.java | 2 +- .../src/org/adempiere/webui/desktop/DefaultDesktop.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/org.adempiere.base/src/org/compiere/model/SystemIDs.java b/org.adempiere.base/src/org/compiere/model/SystemIDs.java index 5efa618a48..5685464606 100644 --- a/org.adempiere.base/src/org/compiere/model/SystemIDs.java +++ b/org.adempiere.base/src/org/compiere/model/SystemIDs.java @@ -50,6 +50,7 @@ public class SystemIDs public final static int FORM_PAYMENT_PRINT_EXPORT = 106; public final static int FORM_ARCHIVEVIEWER = 118; public final static int FORM_REPORT_WIZARD = 200002; + public final static int FORM_SETUP_WIZARD = 200000; public final static int MENU_NOTICE = 233; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java index adea18ffbb..f0153de01e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java @@ -137,7 +137,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL } catch (Exception ex) { - log.log(Level.SEVERE, "VTreeMaintenance.init", ex); + log.log(Level.SEVERE, "WSetupWizard.init", ex); } } // init diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java index 9f6cc44898..aa8ce5ac48 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java @@ -61,6 +61,7 @@ import org.compiere.model.GridTab; import org.compiere.model.MQuery; import org.compiere.model.MRole; import org.compiere.model.MTable; +import org.compiere.model.SystemIDs; import org.compiere.model.X_AD_CtxHelp; import org.compiere.util.CLogger; import org.compiere.util.Env; @@ -669,6 +670,10 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria @Override public void updateHelpContext(String ctxType, int recordId) { + // don't show context for SetupWizard Form, is managed internally using wf and node ctxhelp + if (recordId == SystemIDs.FORM_SETUP_WIZARD && X_AD_CtxHelp.CTXTYPE_Form.equals(ctxType)) + return; + Clients.response(new AuScript("zWatch.fire('onFieldTooltip', this);")); helpController.renderCtxHelp(ctxType, recordId);