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

1003403 Detail tab should not update window context. IDEMPIERE-1485

This commit is contained in:
Heng Sin Low 2013-10-29 15:06:36 +08:00
parent 07c83ff7fd
commit d7f80a1472
3 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/model/GridField.java
View File

@ -1523,7 +1523,7 @@ public class GridField
else if (m_value instanceof Boolean) else if (m_value instanceof Boolean)
{ {
backupValue(); // teo_sarca [ 1699826 ] backupValue(); // teo_sarca [ 1699826 ]
if (!isParentTabField()) if (!isParentTabField() && isUpdateWindowContext())
{ {
Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName, Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName,
((Boolean)m_value).booleanValue()); ((Boolean)m_value).booleanValue());
@ -1534,7 +1534,7 @@ public class GridField
else if (m_value instanceof Timestamp) else if (m_value instanceof Timestamp)
{ {
backupValue(); // teo_sarca [ 1699826 ] backupValue(); // teo_sarca [ 1699826 ]
if (!isParentTabField()) if (!isParentTabField() && isUpdateWindowContext())
{ {
Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName, (Timestamp)m_value); Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName, (Timestamp)m_value);
} }
@ -1554,7 +1554,7 @@ public class GridField
else else
{ {
backupValue(); // teo_sarca [ 1699826 ] backupValue(); // teo_sarca [ 1699826 ]
if (!isParentTabField()) if (!isParentTabField() && isUpdateWindowContext())
{ {
Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName, Env.setContext(m_vo.ctx, m_vo.WindowNo, m_vo.ColumnName,
m_value==null ? null : m_value.toString()); m_value==null ? null : m_value.toString());
@ -2060,6 +2060,14 @@ public class GridField
return isParentTabField(m_vo.ColumnName); return isParentTabField(m_vo.ColumnName);
} }
private boolean isUpdateWindowContext()
{
if (getGridTab() != null)
return getGridTab().isUpdateWindowContext();
return true;
}
/*IDEMPIERE-358*/ /*IDEMPIERE-358*/
public int getXPosition() public int getXPosition()

12
org.adempiere.base/src/org/compiere/model/GridTab.java
View File

@ -2708,6 +2708,8 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
private List<String> activeCallouts = new ArrayList<String>(); private List<String> activeCallouts = new ArrayList<String>();
private List<Callout> activeCalloutInstance = new ArrayList<Callout>(); private List<Callout> activeCalloutInstance = new ArrayList<Callout>();
private boolean m_updateWindowContext = true;
/** /**
* *
* @return list of active call out for this tab * @return list of active call out for this tab
@ -3212,4 +3214,14 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable
public boolean isNew() { public boolean isNew() {
return isOpen() && getCurrentRow() >= 0 && getCurrentRow() == m_mTable.getNewRow(); return isOpen() && getCurrentRow() >= 0 && getCurrentRow() == m_mTable.getNewRow();
} }
public boolean isUpdateWindowContext()
{
return m_updateWindowContext ;
}
public void setUpdateWindowContext(boolean updateWindowContext)
{
m_updateWindowContext = updateWindowContext;
}
} // GridTab } // GridTab

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

@ -533,6 +533,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
// Query first tab // Query first tab
if (tabIndex == 0) if (tabIndex == 0)
{ {
gTab.setUpdateWindowContext(true);
m_queryInitiating = true; m_queryInitiating = true;
getComponent().setVisible(false); getComponent().setVisible(false);
initialQuery(query, gTab, new Callback<MQuery>() { initialQuery(query, gTab, new Callback<MQuery>() {
@ -565,6 +566,10 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
}); });
} }
else
{
gTab.setUpdateWindowContext(false);
}
if (gTab.isSortTab()) if (gTab.isSortTab())
{ {
@ -1149,8 +1154,13 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements
return; return;
} }
IADTabpanel newTabpanel = adTabbox.getSelectedTabpanel(); IADTabpanel newTabpanel = adTabbox.getSelectedTabpanel();
//toggle window context update
if (newTabpanel.getGridTab() != null)
newTabpanel.getGridTab().setUpdateWindowContext(true);
if (oldTabIndex > newTabIndex && oldTabpanel.getGridTab() != null)
oldTabpanel.getGridTab().setUpdateWindowContext(false);
boolean activated = newTabpanel.isActivated(); boolean activated = newTabpanel.isActivated();
if (oldTabpanel != null) if (oldTabpanel != null)