SuggestionField and SuggestionPickerField does not show suggestions i…

…nside screen fragment which placed inside dialog cuba-platform#2970
akhodyko · Jul 17, 2020 · 56e5c12 · 56e5c12
1 parent 766e396
commit 56e5c12
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebSuggestionField.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebSuggestionField.java
@@ -19,7 +19,6 @@
 import com.haulmont.cuba.core.global.MetadataTools;
 import com.haulmont.cuba.core.global.UserSessionSource;
 import com.haulmont.cuba.gui.ComponentsHelper;
-import com.haulmont.cuba.gui.components.ComponentContainer;
 import com.haulmont.cuba.gui.components.SuggestionField;
 import com.haulmont.cuba.gui.components.data.meta.EntityValueSource;
 import com.haulmont.cuba.gui.executors.BackgroundTask;
@@ -28,19 +27,15 @@
 import com.haulmont.cuba.gui.executors.TaskLifeCycle;
 import com.haulmont.cuba.gui.screen.FrameOwner;
 import com.haulmont.cuba.gui.screen.Screen;
+import com.haulmont.cuba.gui.screen.ScreenFragment;
 import com.haulmont.cuba.gui.screen.UiControllerUtils;
 import com.haulmont.cuba.web.widgets.CubaSuggestionField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 
 import javax.inject.Inject;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Function;
 
 import static com.haulmont.cuba.web.gui.components.WebLookupField.NULL_STYLE_GENERATOR;
@@ -310,13 +305,11 @@ protected void showSuggestions(List<V> suggestions, boolean userOriginated) {
             lastDialog = dialogScreen;
         }
 
-        boolean frameInsideDialog = false;
-        if(lastDialog instanceof ComponentContainer) {
-            frameInsideDialog = ComponentsHelper.walkComponents((ComponentContainer) lastDialog,
-                    c -> Objects.equals(c, getFrame()));
+        if(frameOwner instanceof ScreenFragment) {
+            frameOwner = ComponentsHelper.getScreen((ScreenFragment) frameOwner);
         }
 
-        if (lastDialog == null || Objects.equals(frameOwner, lastDialog) || frameInsideDialog) {
+        if (lastDialog == null || Objects.equals(frameOwner, lastDialog)) {
             component.showSuggestions(suggestions, userOriginated);
         }
     }

diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebSuggestionPickerField.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebSuggestionPickerField.java
@@ -20,7 +20,6 @@
 import com.haulmont.cuba.core.entity.Entity;
 import com.haulmont.cuba.core.global.UserSessionSource;
 import com.haulmont.cuba.gui.ComponentsHelper;
-import com.haulmont.cuba.gui.components.ComponentContainer;
 import com.haulmont.cuba.gui.components.SecuredActionsHolder;
 import com.haulmont.cuba.gui.components.SuggestionPickerField;
 import com.haulmont.cuba.gui.executors.BackgroundTask;
@@ -29,19 +28,15 @@
 import com.haulmont.cuba.gui.executors.TaskLifeCycle;
 import com.haulmont.cuba.gui.screen.FrameOwner;
 import com.haulmont.cuba.gui.screen.Screen;
+import com.haulmont.cuba.gui.screen.ScreenFragment;
 import com.haulmont.cuba.gui.screen.UiControllerUtils;
 import com.haulmont.cuba.web.widgets.CubaPickerField;
 import com.haulmont.cuba.web.widgets.CubaSuggestionPickerField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -296,13 +291,11 @@ protected void showSuggestions(List<V> suggestions, boolean userOriginated) {
             lastDialog = dialogScreen;
         }
 
-        boolean frameInsideDialog = false;
-        if(lastDialog instanceof ComponentContainer) {
-            frameInsideDialog = ComponentsHelper.walkComponents((ComponentContainer) lastDialog,
-                    c -> Objects.equals(c, getFrame()));
+        if(frameOwner instanceof ScreenFragment) {
+            frameOwner = ComponentsHelper.getScreen((ScreenFragment) frameOwner);
         }
 
-        if (lastDialog == null || Objects.equals(frameOwner, lastDialog) || frameInsideDialog) {
+        if (lastDialog == null || Objects.equals(frameOwner, lastDialog)) {
             getComponent().showSuggestions(suggestions, userOriginated);
         }
     }