From 063b859619f80c397ba35569f75ab674c46e2e86 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 31 Jul 2013 12:51:56 +0800 Subject: [PATCH 1/3] IDEMPIERE-1222 Folder should be removed as menu lookup option --- .../WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java index d2e6574e34..2f8728b8dc 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/TreeSearchPanel.java @@ -276,7 +276,7 @@ public class TreeSearchPanel extends Panel implements EventListener, Tree protected boolean isFolder(Treeitem treeItem) { List list = treeItem.getChildren(); for (Component c : list) { - if (c instanceof Treechildren && ((Treechildren)c).getChildren().size() > 1) { + if (c instanceof Treechildren && ((Treechildren)c).getChildren().size() > 0) { return true; } } From f5fb6f7d3705c0f48006b428f3cd11e1701058d9 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 31 Jul 2013 14:29:52 +0800 Subject: [PATCH 2/3] IDEMPIERE-840 Improvement to Request model class - fix requesteventhandler.xml --- org.adempiere.base/OSGI-INF/requesteventhandler.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.adempiere.base/OSGI-INF/requesteventhandler.xml b/org.adempiere.base/OSGI-INF/requesteventhandler.xml index 25987bc891..c30b1cc2fd 100644 --- a/org.adempiere.base/OSGI-INF/requesteventhandler.xml +++ b/org.adempiere.base/OSGI-INF/requesteventhandler.xml @@ -1,6 +1,6 @@ - e.base.event.RequestSendEMailEventHandler"/> + From 92532db6de9e536926387d327b45c65f8cb168a2 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Wed, 31 Jul 2013 15:31:58 +0800 Subject: [PATCH 3/3] IDEMPIERE-840 Improvement to Request model class - combine the requestservice.xml and requesteventhandler.xml into one. Use class name as the pid. --- org.adempiere.base/OSGI-INF/metatype/metatype.xml | 6 +++--- org.adempiere.base/OSGI-INF/requesteventhandler.xml | 10 +++++++--- org.adempiere.base/OSGI-INF/requestservice.xml | 10 ---------- org.adempiere.base/build.properties | 1 - .../adempiere/base/event/RequestPropertyService.java | 3 +-- 5 files changed, 11 insertions(+), 19 deletions(-) delete mode 100644 org.adempiere.base/OSGI-INF/requestservice.xml diff --git a/org.adempiere.base/OSGI-INF/metatype/metatype.xml b/org.adempiere.base/OSGI-INF/metatype/metatype.xml index e8c7360b9f..3fa5b331c1 100644 --- a/org.adempiere.base/OSGI-INF/metatype/metatype.xml +++ b/org.adempiere.base/OSGI-INF/metatype/metatype.xml @@ -1,12 +1,12 @@ - + - - + + \ No newline at end of file diff --git a/org.adempiere.base/OSGI-INF/requesteventhandler.xml b/org.adempiere.base/OSGI-INF/requesteventhandler.xml index c30b1cc2fd..f3d44317f0 100644 --- a/org.adempiere.base/OSGI-INF/requesteventhandler.xml +++ b/org.adempiere.base/OSGI-INF/requesteventhandler.xml @@ -1,6 +1,10 @@ - + - - + + + + + + \ No newline at end of file diff --git a/org.adempiere.base/OSGI-INF/requestservice.xml b/org.adempiere.base/OSGI-INF/requestservice.xml deleted file mode 100644 index f471c6518d..0000000000 --- a/org.adempiere.base/OSGI-INF/requestservice.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties index 965833233d..ba576364dc 100644 --- a/org.adempiere.base/build.properties +++ b/org.adempiere.base/build.properties @@ -29,7 +29,6 @@ bin.includes = META-INF/,\ OSGI-INF/defaultpaymentprocessorfactory.xml,\ OSGI-INF/broadcastutil.xml,\ OSGI-INF/requesteventhandler.xml,\ - OSGI-INF/requestservice.xml,\ OSGI-INF/requestpropertyservice.xml,\ schema/ output.base.jar = build/ diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java b/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java index 1a5bcd5666..77a83920d0 100644 --- a/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java +++ b/org.adempiere.base/src/org/adempiere/base/event/RequestPropertyService.java @@ -23,7 +23,6 @@ import java.util.Hashtable; import java.util.Properties; import java.util.logging.Level; -import org.adempiere.base.event.RequestEventHandler; import org.compiere.util.CLogger; import org.compiere.util.Ini; import org.compiere.util.Util; @@ -65,7 +64,7 @@ public class RequestPropertyService { String ignoreRequesTypes = p.getProperty(RequestEventHandler.IGNORE_REQUEST_TYPES); if (!Util.isEmpty(ignoreRequesTypes)) { - Configuration configuration = service.getConfiguration("org.adempiere.base.event.request.service"); + Configuration configuration = service.getConfiguration(RequestEventHandler.class.getName()); if (configuration.getProperties() == null) { Dictionary map = new Hashtable(); map.put(RequestEventHandler.IGNORE_REQUEST_TYPES, ignoreRequesTypes);