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

IDEMPIERE-1969:Contextual Menu for Info Window Parameters 

fix issue preference don't work with field without default value
This commit is contained in:
hieplq 2015-08-01 23:17:35 +08:00
parent 329c91397a
commit 59ec9aa29a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -575,7 +575,7 @@ public class GridField
*/ */
public Object getDefaultForPanel (){ public Object getDefaultForPanel (){
//default is preference for field > special case > default logic > sql default > data-type default //default is preference for field > special case > default logic > sql default > data-type default
String defaultSeq = "61327"; String defaultSeq = "63";
return getDefault (MSysConfig.getValue(MSysConfig.ZK_SEQ_DEFAULT_VALUE_PANEL, defaultSeq, Env.getAD_Client_ID(m_vo.ctx))); return getDefault (MSysConfig.getValue(MSysConfig.ZK_SEQ_DEFAULT_VALUE_PANEL, defaultSeq, Env.getAD_Client_ID(m_vo.ctx)));
} }

8
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java
View File

@ -1289,11 +1289,9 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL
fieldEditor.addEventListener(Events.ON_OK, this); fieldEditor.addEventListener(Events.ON_OK, this);
mField.addPropertyChangeListener(editor); mField.addPropertyChangeListener(editor);
if (!Util.isEmpty(mField.getVO().DefaultValue, true)) { mField.setValue(mField.getDefaultForPanel(), true);
// set default value
mField.setValue(mField.getDefaultForPanel(), true);
}
} // addSelectionColumn } // addSelectionColumn
protected void addSearchParameter(Label label, Component fieldEditor) { protected void addSearchParameter(Label label, Component fieldEditor) {