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

IDEMPIERE-229 Bug with Process parameter range

This commit is contained in:
Carlos Ruiz 2012-08-30 00:37:05 -05:00
parent deef7564be
commit 741743751b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.adempiere.base/src/org/compiere/model/GridFieldVO.java
View File

@ -332,6 +332,11 @@ public class GridFieldVO implements Serializable
// Genied: For a range parameter the second field // Genied: For a range parameter the second field
// lookup behaviour should match the first one. // lookup behaviour should match the first one.
voT.AD_Reference_Value_ID = voF.AD_Reference_Value_ID; voT.AD_Reference_Value_ID = voF.AD_Reference_Value_ID;
// IDEMPIERE-229 Bug with Process parameter range
voT.ValidationCode = voF.ValidationCode;
voT.IsEncryptedField = voF.IsEncryptedField;
voT.ReadOnlyLogic = voF.ReadOnlyLogic;
voT.DisplayLogic = voF.DisplayLogic;
voT.initFinish(); voT.initFinish();
return voT; return voT;

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessParameterPanel.java
View File

@ -46,6 +46,7 @@ import org.compiere.process.ProcessInfo;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.zkoss.zul.Div; import org.zkoss.zul.Div;
import org.zkoss.zul.Hbox; import org.zkoss.zul.Hbox;
import org.zkoss.zul.Label; import org.zkoss.zul.Label;
@ -359,21 +360,24 @@ public class ProcessParameterPanel extends Panel implements
if (sb.length() > 0) if (sb.length() > 0)
sb.append(", "); sb.append(", ");
sb.append(field.getHeader()); sb.append(field.getHeader());
if (m_wEditors2.get(i) != null) // is a range
sb.append(" (").append(Msg.getMsg(Env.getCtx(), "From")).append(")");
} else } else
field.setError(false); field.setError(false);
// Check for Range // Check for Range
WEditor wEditor2 = (WEditor) m_wEditors2.get(i); WEditor wEditor2 = (WEditor) m_wEditors2.get(i);
if (wEditor2 != null) { if (wEditor2 != null) {
Object data2 = wEditor.getValue(); Object data2 = wEditor2.getValue();
GridField field2 = (GridField) m_mFields2.get(i); GridField field2 = (GridField) m_mFields2.get(i);
if (data2 == null || data2.toString().length() == 0) { if (data2 == null || data2.toString().length() == 0) {
field.setInserting(true); // set editable (i.e. field2.setInserting(true); // set editable (i.e.
// updateable) otherwise // updateable) otherwise
// deadlock // deadlock
field2.setError(true); field2.setError(true);
if (sb.length() > 0) if (sb.length() > 0)
sb.append(", "); sb.append(", ");
sb.append(field.getHeader()); sb.append(field2.getHeader());
sb.append(" (").append(Msg.getMsg(Env.getCtx(), "To")).append(")");
} else } else
field2.setError(false); field2.setError(false);
} // range field } // range field