midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Carlos Ruiz 2015-01-17 10:48:54 -05:00
parent 1ff06a2668
commit f2cda463d1
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/src/org/compiere/model/SystemIDs.java
View File

@ -50,6 +50,7 @@ public class SystemIDs
public final static int FORM_PAYMENT_PRINT_EXPORT = 106; public final static int FORM_PAYMENT_PRINT_EXPORT = 106;
public final static int FORM_ARCHIVEVIEWER = 118; public final static int FORM_ARCHIVEVIEWER = 118;
public final static int FORM_REPORT_WIZARD = 200002; public final static int FORM_REPORT_WIZARD = 200002;
public final static int FORM_SETUP_WIZARD = 200000;
public final static int MENU_NOTICE = 233; public final static int MENU_NOTICE = 233;

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WSetupWizard.java
View File

@ -137,7 +137,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
} }
catch (Exception ex) catch (Exception ex)
{ {
log.log(Level.SEVERE, "VTreeMaintenance.init", ex); log.log(Level.SEVERE, "WSetupWizard.init", ex);
} }
} // init } // init

5
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
View File

@ -61,6 +61,7 @@ import org.compiere.model.GridTab;
import org.compiere.model.MQuery; import org.compiere.model.MQuery;
import org.compiere.model.MRole; import org.compiere.model.MRole;
import org.compiere.model.MTable; import org.compiere.model.MTable;
import org.compiere.model.SystemIDs;
import org.compiere.model.X_AD_CtxHelp; import org.compiere.model.X_AD_CtxHelp;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
@ -669,6 +670,10 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
@Override @Override
public void updateHelpContext(String ctxType, int recordId) { 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);")); Clients.response(new AuScript("zWatch.fire('onFieldTooltip', this);"));
helpController.renderCtxHelp(ctxType, recordId); helpController.renderCtxHelp(ctxType, recordId);