fix for MID-5228 && MID-5062 - configRepositoryQuery is not required …

…for advanced query in search panel
Evolveum · Aug 7, 2019 · 4a08c00 · 4a08c00
1 parent b99da9c
commit 4a08c00
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -199,25 +199,24 @@ protected void onSubmit(AjaxRequestTarget target) {
 
             @Override
             public boolean isEnabled() {
-                if (SearchBoxModeType.BASIC.equals(getModelObject().getSearchType()) ||
-                        SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType())) {
-                    return true;
-                }
-                return false;
+                return (SearchBoxModeType.BASIC.equals(getModelObject().getSearchType())
+                        || SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType())
+                        || (SearchBoxModeType.ADVANCED.equals(getModelObject().getSearchType()) && !queryPlagroundAccessible));
            }
 
 			@Override
 			public boolean isVisible() {
-				return SearchBoxModeType.BASIC.equals(getModelObject().getSearchType()) ||
-                        SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType());
-			}
+                return (SearchBoxModeType.BASIC.equals(getModelObject().getSearchType())
+                        || SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType())
+                        || (SearchBoxModeType.ADVANCED.equals(getModelObject().getSearchType()) && !queryPlagroundAccessible));
+            }
 		});
         searchSimple.setOutputMarkupId(true);
         searchContainer.add(searchSimple);
 
 		WebMarkupContainer searchDropdown = new WebMarkupContainer(ID_SEARCH_DROPDOWN);
 		searchDropdown.add(new VisibleEnableBehaviour() {
-			
+
 			private static final long serialVersionUID = 1L;
 			@Override
 			public boolean isVisible() {
@@ -246,8 +245,8 @@ protected void onSubmit(AjaxRequestTarget target) {
 			private static final long serialVersionUID = 1L;
 			@Override
 			public boolean isEnabled() {
-                if (SearchBoxModeType.BASIC.equals(getModelObject().getSearchType()) ||
-                        SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType())) {
+                if (SearchBoxModeType.BASIC.equals(getModelObject().getSearchType())
+                        || SearchBoxModeType.FULLTEXT.equals(getModelObject().getSearchType())) {
                     return true;
                 }