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

Merge 

8327, hengsin, 05 February 2009
[ 2567395 ] Column name hardcoded in asi editor
This commit is contained in:
Heng Sin Low 2009-02-06 08:38:15 +00:00
parent 60baeab210
commit ae4ed21cae
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/org/compiere/grid/ed/VPAttribute.java
View File

@ -426,7 +426,12 @@ public class VPAttribute extends JComponent
setValue(new Integer(M_AttributeSetInstance_ID)); setValue(new Integer(M_AttributeSetInstance_ID));
try try
{ {
fireVetoableChange("M_AttributeSetInstance_ID", new Object(), getValue()); String columnName = "M_AttributeSetInstance_ID";
if (m_GridField != null)
{
columnName = m_GridField.getColumnName();
}
fireVetoableChange(columnName, new Object(), getValue());
} }
catch (PropertyVetoException pve) catch (PropertyVetoException pve)
{ {

12
client/src/org/compiere/grid/ed/VPAttributeDialog.java
View File

@ -108,6 +108,14 @@ public class VPAttributeDialog extends CDialog
m_AD_Column_ID = AD_Column_ID; m_AD_Column_ID = AD_Column_ID;
m_WindowNoParent = WindowNo; m_WindowNoParent = WindowNo;
//get columnName from ad_column
m_columnName = DB.getSQLValueString(null, "SELECT ColumnName FROM AD_Column WHERE AD_Column_ID = ?", m_AD_Column_ID);
if (m_columnName == null || m_columnName.trim().length() == 0)
{
//fallback
m_columnName = "M_AttributeSetInstance_ID";
}
try try
{ {
jbInit(); jbInit();
@ -169,6 +177,8 @@ public class VPAttributeDialog extends CDialog
private ALayout centerLayout = new ALayout(5,5, true); private ALayout centerLayout = new ALayout(5,5, true);
private ConfirmPanel confirmPanel = new ConfirmPanel (true); private ConfirmPanel confirmPanel = new ConfirmPanel (true);
private String m_columnName = null;
/** /**
* Layout * Layout
* @throws Exception * @throws Exception
@ -455,7 +465,7 @@ public class VPAttributeDialog extends CDialog
removeAll(); removeAll();
Env.clearWinContext(m_WindowNo); Env.clearWinContext(m_WindowNo);
// //
Env.setContext(Env.getCtx(), m_WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID", Env.setContext(Env.getCtx(), m_WindowNo, Env.TAB_INFO, m_columnName,
String.valueOf(m_M_AttributeSetInstance_ID)); String.valueOf(m_M_AttributeSetInstance_ID));
Env.setContext(Env.getCtx(), m_WindowNo, Env.TAB_INFO, "M_Locator_ID", Env.setContext(Env.getCtx(), m_WindowNo, Env.TAB_INFO, "M_Locator_ID",
String.valueOf(m_M_Locator_ID)); String.valueOf(m_M_Locator_ID));