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

IDEMPIERE-2404 Position in first pending node in Setup Wizard

This commit is contained in:
Carlos Ruiz 2015-01-16 19:58:10 -05:00
parent a19706d738
commit 1ff06a2668
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -209,12 +209,14 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
Treeitem treeitemwf = new Treeitem(); Treeitem treeitemwf = new Treeitem();
Treechildren treeChildren = wfnodeTree.getTreechildren(); Treechildren treeChildren = wfnodeTree.getTreechildren();
treeChildren.appendChild(treeitemwf); treeChildren.appendChild(treeitemwf);
nextItems.add(treeitemwf);
addNodes(wfwizard, treeitemwf); addNodes(wfwizard, treeitemwf);
if ( treeitemwf.getTreechildren() == null if ( treeitemwf.getTreechildren() == null
|| treeitemwf.getTreechildren().getChildren() == null || treeitemwf.getTreechildren().getChildren() == null
|| treeitemwf.getTreechildren().getChildren().size() == 0) { || treeitemwf.getTreechildren().getChildren().size() == 0) {
// no nodes // no nodes
treeChildren.removeChild(treeitemwf); treeChildren.removeChild(treeitemwf);
nextItems.remove(treeitemwf);
treeitemwf = null; treeitemwf = null;
return; return;
} }
@ -234,7 +236,6 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
Treecell treecell = new Treecell(); Treecell treecell = new Treecell();
treerow.appendChild(treecell); treerow.appendChild(treecell);
treecell.appendChild(div); treecell.appendChild(div);
nextItems.add(treeitemwf);
if (openNodes.contains(wfwizard.getAD_Workflow_ID())) if (openNodes.contains(wfwizard.getAD_Workflow_ID()))
treeitemwf.setOpen(true); treeitemwf.setOpen(true);
if (firstOpenWF == treeitemwf && allPending) { if (firstOpenWF == treeitemwf && allPending) {
@ -660,6 +661,7 @@ public class WSetupWizard extends SetupWizard implements IFormController, EventL
SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Workflow, wfid); SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Workflow, wfid);
} else if (ti.getAttribute("AD_WF_Node_ID") != null) { } else if (ti.getAttribute("AD_WF_Node_ID") != null) {
// MWFNode // MWFNode
((Treeitem)ti.getParent().getParent()).setOpen(true);
int nodeid = (Integer) ti.getAttribute("AD_WF_Node_ID"); int nodeid = (Integer) ti.getAttribute("AD_WF_Node_ID");
showInRightPanel(0, nodeid); showInRightPanel(0, nodeid);
SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Node, nodeid); SessionManager.getAppDesktop().updateHelpContext(X_AD_CtxHelp.CTXTYPE_Node, nodeid);