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

Merge with 01e90e3d33645ec8f24663c10589b3a5d59a6e50

This commit is contained in:
Elaine Tan 2013-02-22 17:41:33 +08:00
parent a4aeb85c5c 30debbd3e1
commit 8d88fd8f4f
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/CompositeADTabbox.java
View File

@ -369,14 +369,15 @@ public class CompositeADTabbox extends AbstractADTabbox
protected void updateTabState() {
if (isDetailPaneLoaded())
{
boolean hasChanges = false;
for(int i = 0; i < headerTab.getDetailPane().getTabcount(); i++)
{
IADTabpanel adtab = headerTab.getDetailPane().getADTabpanel(i);
if (adtab.getDisplayLogic() != null && adtab.getDisplayLogic().trim().length() > 0) {
if (!Evaluator.evaluateLogic(headerTab, adtab.getDisplayLogic())) {
headerTab.getDetailPane().setTabVisibility(i, false);
} else {
headerTab.getDetailPane().setTabVisibility(i, true);
boolean visible = Evaluator.evaluateLogic(headerTab, adtab.getDisplayLogic());
if (headerTab.getDetailPane().isTabVisible(i) != visible) {
headerTab.getDetailPane().setTabVisibility(i, visible);
hasChanges = true;
}
}
}
@ -392,7 +393,10 @@ public class CompositeADTabbox extends AbstractADTabbox
break;
}
}
hasChanges = true;
}
if (hasChanges)
headerTab.getDetailPane().invalidate();
}
}
@ -528,6 +532,12 @@ public class CompositeADTabbox extends AbstractADTabbox
tabLabel = tabLabelList.get(i);
if (tabLabel.tabLevel == headerTab.getTabLevel()) {
IADTabpanel adtab = tabPanelList.get(i);
if (adtab.getDisplayLogic() != null && adtab.getDisplayLogic().trim().length() > 0) {
if (!Evaluator.evaluateLogic(headerTab, adtab.getDisplayLogic())) {
continue;
}
}
links.put(Integer.toString(i), tabLabel.label);
} else if (tabLabel.tabLevel < headerTab.getTabLevel()) {
break;