From 2dbbc93485ab5a20087fe1370d0eb24cf95e6017 Mon Sep 17 00:00:00 2001
From: Diego Ruiz <12065321+d-ruiz@users.noreply.github.com>
Date: Sat, 23 Jan 2021 12:32:19 +0100
Subject: [PATCH] IDEMPIERE-4665 SearchQuery should behave the same as the
 toolbar buttons - role access,advanced button,dynamic display (#548)

---
 .../adempiere/webui/adwindow/ADWindowToolbar.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
index 8cbd0437e5..2b7f8d95a6 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/ADWindowToolbar.java
@@ -898,6 +898,11 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 								break;
 							}					
 						}					
+					} else if (p instanceof Combobox) {
+						if (advancedName.equals(((Combobox) p).getId())) {
+							this.removeChild(p);
+							break;
+						}
 					}
 				}
 
@@ -946,6 +951,8 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 				if (p instanceof ToolBarButton) {
 					if (!customButtons.contains(p) && !p.isVisible())
 						p.setVisible(true);
+				} else if (p instanceof Combobox && !p.isVisible()) {
+					p.setVisible(true);
 				}
 			}
 			
@@ -964,6 +971,11 @@ public class ADWindowToolbar extends FToolbar implements EventListener<Event>
 								break;
 							}					
 						}					
+					}  else if (p instanceof Combobox) {
+						if (restrictName.equals(((Combobox) p).getId())) {
+							p.setVisible(false);
+							break;
+						}
 					}
 				}