From 3eedf21293c96c03101e9b85dc69a2befc1f96bf Mon Sep 17 00:00:00 2001 From: Nicolas Micoud Date: Mon, 5 Mar 2018 21:27:40 +0100 Subject: [PATCH] IDEMPIERE-3643 Placeholders for every fields - missing editors --- .../WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java | 2 ++ .../src/org/adempiere/webui/editor/WAssignmentEditor.java | 2 ++ .../src/org/adempiere/webui/editor/WDatetimeEditor.java | 2 ++ .../src/org/adempiere/webui/editor/WFileDirectoryEditor.java | 2 ++ .../src/org/adempiere/webui/editor/WFilenameEditor.java | 2 ++ .../WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java | 1 + .../src/org/adempiere/webui/editor/WPAttributeEditor.java | 3 +++ .../WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java | 2 ++ .../WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java | 2 ++ .../WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java | 2 ++ 10 files changed, 20 insertions(+) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java index 02c832e111..561581364d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java @@ -65,6 +65,8 @@ public class WAccountEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, true); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java index 6aa65ab5b2..05d1485a7d 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java @@ -64,6 +64,8 @@ public class WAssignmentEditor extends WEditor implements ContextMenuListener { popupMenu = new WEditorPopupMenu(true, false, false); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java index a1ee54eb56..7876aeba27 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WDatetimeEditor.java @@ -102,6 +102,8 @@ public class WDatetimeEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); + if (gridField != null) + getComponent().getDatebox().setPlaceholder(gridField.getPlaceholder()); } public void onEvent(Event event) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java index d602244011..7184b3b355 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFileDirectoryEditor.java @@ -47,6 +47,8 @@ public class WFileDirectoryEditor extends WEditor else getComponent().setButtonImage(ThemeManager.getThemeResource("images/Open16.png")); getComponent().getButton().setUpload("false"); + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java index 187fe11da7..bf3325964b 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WFilenameEditor.java @@ -55,6 +55,8 @@ public class WFilenameEditor extends WEditor getComponent().addEventListener(Events.ON_UPLOAD, this); getComponent().getButton().setUpload(AdempiereWebUI.getUploadSetting()); getComponent().getButton().setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE); + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java index 82e633b3fd..35f4531da9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java @@ -127,6 +127,7 @@ public class WLocatorEditor extends WEditor implements EventListener, Pro { popupMenu = new WEditorPopupMenu(true, true, isShowPreference()); addChangeLogMenu(popupMenu); + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java index 90c30831d6..0ae327287e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java @@ -84,6 +84,9 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener addChangeLogMenu(popupMenu); getComponent().getTextbox().setReadonly(true); + + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java index b7d30d9fc0..46eea1504e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPaymentEditor.java @@ -88,6 +88,8 @@ public class WPaymentEditor extends WEditor implements ListDataListener, Context } popupMenu = new WEditorPopupMenu(false, true, isShowPreference()); addChangeLogMenu(popupMenu); + if (gridField != null) + getComponent().getCombobox().setPlaceholder(gridField.getPlaceholder()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java index 245c8815da..6f7780e760 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTimeEditor.java @@ -102,6 +102,8 @@ public class WTimeEditor extends WEditor implements ContextMenuListener popupMenu = new WEditorPopupMenu(false, false, isShowPreference()); popupMenu.addMenuListener(this); addChangeLogMenu(popupMenu); + if (gridField != null) + getComponent().setPlaceholder(gridField.getPlaceholder()); } public void onEvent(Event event) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java index 90f48a07e8..1079bf99e1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WUrlEditor.java @@ -46,6 +46,8 @@ public class WUrlEditor extends WEditor implements ContextMenuListener addChangeLogMenu(popupMenu); getComponent().getTextbox().setClientAttribute("type", "url"); + if (gridField != null) + getComponent().getTextbox().setPlaceholder(gridField.getPlaceholder()); }