MID-4649 GUI Users List - reloads permanently

Evolveum · May 15, 2018 · 503bfd5 · 503bfd5
1 parent abaa23c
commit 503bfd5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/NewWindowNotifyingBehavior.java
@@ -21,6 +21,7 @@
 import org.apache.wicket.ajax.AjaxNewWindowNotifyingBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 /**
  * Created by lazyman on 13/03/2017.
@@ -33,7 +34,11 @@ public class NewWindowNotifyingBehavior extends AjaxNewWindowNotifyingBehavior {
     protected void onNewWindow(AjaxRequestTarget target) {
         LOG.debug("Page version already used in different tab, refreshing page");
         WebPage page = (WebPage) getComponent();
-
-        page.setResponsePage(page.getPageClass(), page.getPageParameters());
+        //fix for MID-4649; windowName parameter causes recursive reloading of the page
+        PageParameters pageParameters = page.getPageParameters();
+        if (pageParameters != null && pageParameters.getPosition("windowName") > -1 ){
+            pageParameters = pageParameters.remove("windowName");
+        }
+        page.setResponsePage(page.getPageClass(), pageParameters);
     }
 }