summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2009-10-30 09:41:43 -0700
committerShawn O. Pearce <sop@google.com>2009-10-30 09:43:21 -0700
commitc3befb4271e76e031c2f1775e0f999c43fd98542 (patch)
tree1180b6cb442ea543cfb23db2b90bcf5a42c5bcb0
parent7d25f7819c53d40d045fb2531de01275be0aec62 (diff)
Fix OpenID self registration dialog
In f7e065e39d22 ("Support username/password authentication by LDAP") we broke the OpenID registration dialog when we moved everything into a subclass, but failed to update the self register link's callsite to use the new dialog. Use the OpenIdSignInDialog when opening the dialog, to ensure it has the proper content. Bug: issue 294 Change-Id: I89e1b0862e446c2486e3a45007562a6bf092f49f Signed-off-by: Shawn O. Pearce <sop@google.com>
-rw-r--r--src/main/java/com/google/gerrit/client/Gerrit.java2
-rw-r--r--src/main/java/com/google/gerrit/client/SignInDialog.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/google/gerrit/client/Gerrit.java b/src/main/java/com/google/gerrit/client/Gerrit.java
index 3616dc8bd2..6b655b846d 100644
--- a/src/main/java/com/google/gerrit/client/Gerrit.java
+++ b/src/main/java/com/google/gerrit/client/Gerrit.java
@@ -349,7 +349,7 @@ public class Gerrit implements EntryPoint {
case OPENID:
menuRight.addItem(C.menuRegister(), new Command() {
public void execute() {
- new SignInDialog(SignInDialog.Mode.REGISTER).center();
+ new OpenIdSignInDialog(SignInDialog.Mode.REGISTER, null).center();
}
});
// fall through
diff --git a/src/main/java/com/google/gerrit/client/SignInDialog.java b/src/main/java/com/google/gerrit/client/SignInDialog.java
index a995493fc4..1226533b46 100644
--- a/src/main/java/com/google/gerrit/client/SignInDialog.java
+++ b/src/main/java/com/google/gerrit/client/SignInDialog.java
@@ -17,7 +17,7 @@ package com.google.gerrit.client;
import com.google.gwtexpui.user.client.AutoCenterDialogBox;
/** Prompts the user to sign in to their account. */
-public class SignInDialog extends AutoCenterDialogBox {
+public abstract class SignInDialog extends AutoCenterDialogBox {
public static enum Mode {
SIGN_IN, LINK_IDENTIY, REGISTER;
}