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

IDEMPIERE-3546 Use specific messages for range process parameters placeholder

This commit is contained in:
Nicolas Micoud 2017-11-08 08:26:46 +01:00
parent dfa3855d19
commit 8a1635f42c
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/i5.1/oracle/201711061600_IDEMPIERE-3546.sql Normal file
View File

@ -0,0 +1,14 @@
SET SQLBLANKLINES ON
SET DEFINE OFF
-- IDEMPIERE-3546 - Use specific messages for range process parameters placeholder
-- Nov 6, 2017 4:07:29 PM CET
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','From',0,0,'Y',TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,200438,'ProcessParameterRangeFrom','D','44852250-153e-462a-b206-897d0c2cd1ab')
;
-- Nov 6, 2017 4:07:42 PM CET
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_DATE('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52')
;
SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual
;

11
migration/i5.1/postgresql/201711061600_IDEMPIERE-3546.sql Normal file
View File

@ -0,0 +1,11 @@
-- IDEMPIERE-3546 - Use specific messages for range process parameters placeholder
-- Nov 6, 2017 4:07:29 PM CET
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','From',0,0,'Y',TO_TIMESTAMP('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-11-06 16:07:28','YYYY-MM-DD HH24:MI:SS'),0,200438,'ProcessParameterRangeFrom','D','44852250-153e-462a-b206-897d0c2cd1ab')
;
-- Nov 6, 2017 4:07:42 PM CET
INSERT INTO AD_Message (MsgType,MsgText,AD_Client_ID,AD_Org_ID,IsActive,Created,CreatedBy,Updated,UpdatedBy,AD_Message_ID,Value,EntityType,AD_Message_UU) VALUES ('I','To',0,0,'Y',TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,TO_TIMESTAMP('2017-11-06 16:07:42','YYYY-MM-DD HH24:MI:SS'),0,200439,'ProcessParameterRangeTo','D','07220887-ecb2-42e9-9665-260041080b52')
;
SELECT register_migration_script('201711061600_IDEMPIERE-3546.sql') FROM dual
;

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

@ -333,7 +333,7 @@ public class ProcessParameterPanel extends Panel implements
ZKUpdateUtil.setWidth(box, "100%"); ZKUpdateUtil.setWidth(box, "100%");
box.appendChild(editor.getComponent()); box.appendChild(editor.getComponent());
ZKUpdateUtil.setWidth((HtmlBasedComponent) editor.getComponent(), "49%"); ZKUpdateUtil.setWidth((HtmlBasedComponent) editor.getComponent(), "49%");
setEditorPlaceHolder(editor, Msg.getMsg(Env.getCtx(), "From")); setEditorPlaceHolder(editor, Msg.getMsg(Env.getCtx(), "ProcessParameterRangeFrom"));
// //
GridFieldVO voF2 = GridFieldVO.createParameter(voF); GridFieldVO voF2 = GridFieldVO.createParameter(voF);
GridField mField2 = new GridField(voF2); GridField mField2 = new GridField(voF2);
@ -348,7 +348,7 @@ public class ProcessParameterPanel extends Panel implements
mField2.addPropertyChangeListener(editor2); mField2.addPropertyChangeListener(editor2);
editor2.dynamicDisplay(); editor2.dynamicDisplay();
ZKUpdateUtil.setWidth((HtmlBasedComponent) editor2.getComponent(), "49%"); ZKUpdateUtil.setWidth((HtmlBasedComponent) editor2.getComponent(), "49%");
setEditorPlaceHolder(editor2, Msg.getMsg(Env.getCtx(), "To")); setEditorPlaceHolder(editor2, Msg.getMsg(Env.getCtx(), "ProcessParameterRangeTo"));
// setup editor context menu // setup editor context menu
popupMenu = editor2.getPopupMenu(); popupMenu = editor2.getPopupMenu();
if (popupMenu != null) { if (popupMenu != null) {
@ -417,7 +417,7 @@ public class ProcessParameterPanel extends Panel implements
sb.append(", "); sb.append(", ");
sb.append(field.getHeader()); sb.append(field.getHeader());
if (m_wEditors2.get(i) != null) // is a range if (m_wEditors2.get(i) != null) // is a range
sb.append(" (").append(Msg.getMsg(Env.getCtx(), "From")).append(")"); sb.append(" (").append(Msg.getMsg(Env.getCtx(), "ProcessParameterRangeFrom")).append(")");
} else } else
field.setError(false); field.setError(false);
// Check for Range // Check for Range
@ -433,7 +433,7 @@ public class ProcessParameterPanel extends Panel implements
if (sb.length() > 0) if (sb.length() > 0)
sb.append(", "); sb.append(", ");
sb.append(field2.getHeader()); sb.append(field2.getHeader());
sb.append(" (").append(Msg.getMsg(Env.getCtx(), "To")).append(")"); sb.append(" (").append(Msg.getMsg(Env.getCtx(), "ProcessParameterRangeTo")).append(")");
} else } else
field2.setError(false); field2.setError(false);
} // range field } // range field