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

IDEMPIERE-369 Master Detail layout improvements. Make use of the ad_tab.isSingleRow for detail tabs and onNew event - only auto switch to form view if isSingleRow=Y.

This commit is contained in:
Heng Sin Low 2013-01-30 11:23:39 +08:00
parent 15208de636
commit 226a1d9b86
4 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java
View File

@ -1526,6 +1526,18 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
toolbar.enableIgnore(true); toolbar.enableIgnore(true);
toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted()); toolbar.enablePrint(adTabbox.getSelectedGridTab().isPrinted());
toolbar.enableReport(true); toolbar.enableReport(true);
if (adTabbox.getSelectedGridTab().isSingleRow())
{
if (adTabbox.getSelectedTabpanel().isGridView())
{
adTabbox.getSelectedTabpanel().switchRowPresentation();
}
}
if (adTabbox.getSelectedTabpanel().isGridView())
{
adTabbox.getSelectedTabpanel().getGridView().editCurrentRow();
}
} }
else else
{ {

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

@ -108,9 +108,16 @@ public class CompositeADTabbox extends AbstractADTabbox
@Override @Override
public void onCallback(Boolean result) { public void onCallback(Boolean result) {
if (result) { if (result) {
onEditDetail(row, true); if (getSelectedDetailADTabpanel().getGridTab().isSingleRow()) {
if (!adWindowPanel.getActiveGridTab().isNew()) onEditDetail(row, true);
adWindowPanel.onNew(); if (!adWindowPanel.getActiveGridTab().isNew())
adWindowPanel.onNew();
} else {
if (!getSelectedDetailADTabpanel().getGridTab().isNew()) {
getSelectedDetailADTabpanel().getGridTab().dataNew(false);
getSelectedDetailADTabpanel().getGridView().editCurrentRow();
}
}
} }
} }
}); });

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/DetailPane.java
View File

@ -232,7 +232,7 @@ public class DetailPane extends Panel implements EventListener<Event>, IdSpace {
} }
} }
if (adtab != null && adtab.isDetailPaneMode()) { if (adtab != null && adtab.isDetailPaneMode()) {
onEdit(false); onEdit(adtab.getGridTab().isSingleRow());
} }
} }
}); });

7
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridView.java
View File

@ -820,4 +820,11 @@ public class GridView extends Vbox implements EventListener<Event>, IdSpace
public GridField[] getFields() { public GridField[] getFields() {
return gridField; return gridField;
} }
public void editCurrentRow() {
if (!renderer.isEditing()) {
renderer.editCurrentRow();
renderer.setFocusToEditor();
}
}
} }