IDEMPIERE-520 Master/Detail bugs found using Production window. Fixed regression after the 6.5.1 upgrade.
This commit is contained in:
parent
ae93d9ecc6
commit
ebb76fd02c
|
@ -1226,6 +1226,7 @@ DataStatusListener, IADTabpanel, IdSpace
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setDetailPaneMode(boolean detailPaneMode) {
|
public void setDetailPaneMode(boolean detailPaneMode) {
|
||||||
|
if (this.detailPaneMode != detailPaneMode) {
|
||||||
this.detailPaneMode = detailPaneMode;
|
this.detailPaneMode = detailPaneMode;
|
||||||
if (detailPaneMode) {
|
if (detailPaneMode) {
|
||||||
detailPane = null;
|
detailPane = null;
|
||||||
|
@ -1239,6 +1240,7 @@ DataStatusListener, IADTabpanel, IdSpace
|
||||||
this.setVflex("true");
|
this.setVflex("true");
|
||||||
listPanel.setDetailPaneMode(detailPaneMode);
|
listPanel.setDetailPaneMode(detailPaneMode);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all visible button editors
|
* Get all visible button editors
|
||||||
|
|
|
@ -1399,7 +1399,10 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
|
|
||||||
|
if (!detailTab)
|
||||||
|
{
|
||||||
adTabbox.evaluate(e);
|
adTabbox.evaluate(e);
|
||||||
|
}
|
||||||
|
|
||||||
toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted());
|
toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted());
|
||||||
toolbar.enableReport(true);
|
toolbar.enableReport(true);
|
||||||
|
|
|
@ -319,12 +319,14 @@ public class CompositeADTabbox extends AbstractADTabbox
|
||||||
private void activateDetailADTabpanel() {
|
private void activateDetailADTabpanel() {
|
||||||
if (detailPane != null && detailPane.getParent() != null) {
|
if (detailPane != null && detailPane.getParent() != null) {
|
||||||
IADTabpanel tabPanel = detailPane.getSelectedADTabpanel();
|
IADTabpanel tabPanel = detailPane.getSelectedADTabpanel();
|
||||||
|
if (tabPanel != null) {
|
||||||
tabPanel.activate(true);
|
tabPanel.activate(true);
|
||||||
if (!tabPanel.isGridView()) {
|
if (!tabPanel.isGridView()) {
|
||||||
tabPanel.switchRowPresentation();
|
tabPanel.switchRowPresentation();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void updateTabState() {
|
protected void updateTabState() {
|
||||||
|
@ -516,7 +518,7 @@ public class CompositeADTabbox extends AbstractADTabbox
|
||||||
}
|
}
|
||||||
|
|
||||||
IADTabpanel detailTab = detailPane.getSelectedADTabpanel();
|
IADTabpanel detailTab = detailPane.getSelectedADTabpanel();
|
||||||
|
if (detailTab != null) {
|
||||||
//check data action
|
//check data action
|
||||||
String uuid = (String) execution.getAttribute(CompositeADTabbox.class.getName()+".dataAction");
|
String uuid = (String) execution.getAttribute(CompositeADTabbox.class.getName()+".dataAction");
|
||||||
if (uuid != null && uuid.equals(detailTab.getUuid())) {
|
if (uuid != null && uuid.equals(detailTab.getUuid())) {
|
||||||
|
@ -537,6 +539,7 @@ public class CompositeADTabbox extends AbstractADTabbox
|
||||||
}
|
}
|
||||||
detailTab.activate(true);
|
detailTab.activate(true);
|
||||||
detailTab.setDetailPaneMode(true);
|
detailTab.setDetailPaneMode(true);
|
||||||
|
}
|
||||||
detailPane.setVflex("true");
|
detailPane.setVflex("true");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -537,9 +537,13 @@ public class DetailPane extends Panel implements EventListener<Event>, IdSpace {
|
||||||
|
|
||||||
Tab tab = (Tab) tabbox.getTabs().getChildren().get(i);
|
Tab tab = (Tab) tabbox.getTabs().getChildren().get(i);
|
||||||
tab.setVisible(visible);
|
tab.setVisible(visible);
|
||||||
if (tab.getLinkedPanel() != null)
|
if (tab.isSelected()) {
|
||||||
|
tab.setSelected(false);
|
||||||
|
}
|
||||||
|
if (tab.getLinkedPanel() != null) {
|
||||||
tab.getLinkedPanel().setVisible(visible);
|
tab.getLinkedPanel().setVisible(visible);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isTabVisible(int i) {
|
public boolean isTabVisible(int i) {
|
||||||
if (i < 0 || tabbox.getTabs() == null || i >= tabbox.getTabs().getChildren().size())
|
if (i < 0 || tabbox.getTabs() == null || i >= tabbox.getTabs().getChildren().size())
|
||||||
|
|
|
@ -167,10 +167,12 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setDetailPaneMode(boolean detailPaneMode) {
|
public void setDetailPaneMode(boolean detailPaneMode) {
|
||||||
|
if (this.detailPaneMode != detailPaneMode) {
|
||||||
this.detailPaneMode = detailPaneMode;
|
this.detailPaneMode = detailPaneMode;
|
||||||
pageSize = detailPaneMode ? DEFAULT_DETAIL_PAGE_SIZE : MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 20);
|
pageSize = detailPaneMode ? DEFAULT_DETAIL_PAGE_SIZE : MSysConfig.getIntValue(MSysConfig.ZK_PAGING_SIZE, 20);
|
||||||
updatePaging();
|
updatePaging();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isDetailPaneMode() {
|
public boolean isDetailPaneMode() {
|
||||||
return this.detailPaneMode;
|
return this.detailPaneMode;
|
||||||
|
|
|
@ -45,6 +45,18 @@ public class Tabpanel extends org.zkoss.zul.Tabpanel implements IdSpace
|
||||||
return enabled;
|
return enabled;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean setVisible(boolean visible) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return super.setVisible(visible);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void setVisibleDirectly(boolean visible) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
super.setVisibleDirectly(visible);
|
||||||
|
}
|
||||||
|
|
||||||
public void setEnabled(boolean enabled)
|
public void setEnabled(boolean enabled)
|
||||||
{
|
{
|
||||||
this.enabled = enabled;
|
this.enabled = enabled;
|
||||||
|
|
Loading…
Reference in New Issue