[BZ 1089789] - Login Broken for GWT Dev Mode - Fixing the new login p…

…age for GWT development mode.
rhq-project · Apr 22, 2014 · 769bb64 · 769bb64
1 parent 1bc9904
commit 769bb64
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java
@@ -122,6 +122,7 @@ public class LoginView extends Canvas {
     private static final String ERROR_FEEDBACK_DIV_ID = "errorFeedback";
     private static final String HTML_ID = "htmlId";
     private String errorMessage;
+    private static volatile boolean isLoginView = true;
 
     private ProductInfo productInfo;
 
@@ -146,7 +147,7 @@ public void showLoginDialog() {
                 redirectTo(LOGIN_VIEW);
                 return;
             }
-
+            isLoginView = true;
             loginShowing = true;
             form = new DynamicForm();
             form.setMargin(25);
@@ -673,12 +674,15 @@ private native void injectLoginFunction(LoginView view) /*-{
     }-*/;
 
     public static boolean isLoginView() {
-        return com.google.gwt.user.client.Window.Location.getHref().contains(LOGIN_VIEW);
+        return isLoginView && com.google.gwt.user.client.Window.Location.getHref().contains(LOGIN_VIEW);
     }
 
     public static void redirectTo(String path) {
         if (path != null && !("/coregui/" + path).equals(com.google.gwt.user.client.Window.Location.getPath())) {
-            com.google.gwt.user.client.Window.Location.replace(GWT.getHostPageBaseURL() + path
+            if (path.isEmpty()) {
+                isLoginView = false;
+            }
+            com.google.gwt.user.client.Window.Location.assign(GWT.getHostPageBaseURL() + path
                 + com.google.gwt.user.client.Window.Location.getQueryString()
                 + com.google.gwt.user.client.Window.Location.getHash());
         }

diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java
@@ -437,7 +437,6 @@ public void onSuccess(String result) {
                             sessionTimeout = SESSION_TIMEOUT_MINIMUM;
                         }
 
-                        refresh();
                         LoginView.redirectTo(""); // redirect back to the "root" path (coregui/)
                     }