You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/09 06:45:47 UTC
openmeetings git commit: [OPENMEETINGS-1717] redirect seems to work
as expected in FF
Repository: openmeetings
Updated Branches:
refs/heads/master d856a8afb -> 10e64c047
[OPENMEETINGS-1717] redirect seems to work as expected in FF
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/10e64c04
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/10e64c04
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/10e64c04
Branch: refs/heads/master
Commit: 10e64c0474b6ab79f55033e52c369851516621d5
Parents: d856a8a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Oct 9 13:45:39 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Oct 9 13:45:39 2017 +0700
----------------------------------------------------------------------
.../web/pages/auth/SignInDialog.java | 29 ++++++++++----------
1 file changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/10e64c04/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index d0196cb..6b56edd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -24,6 +24,7 @@ import static org.apache.openmeetings.web.app.Application.getAuthenticationStrat
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
+import static org.apache.openmeetings.web.pages.auth.SignInPage.showAuth;
import static org.apache.openmeetings.web.room.SwfPanel.SWF;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
@@ -44,8 +45,8 @@ import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.pages.HashPage;
import org.apache.openmeetings.web.util.NonClosableDialog;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -272,22 +273,20 @@ public class SignInDialog extends NonClosableDialog<String> {
@Override
protected void populateItem(final ListItem<OAuthServer> item) {
- Button btn = new Button("oauthBtn");
final OAuthServer s = item.getModelObject();
- Image icon = new Image("icon", Model.of(""));
- icon.setVisible(!Strings.isEmpty(s.getIconUrl()));
- icon.add(AttributeModifier.replace("src", s.getIconUrl()));
- btn.add(icon);
- btn.add(new Label("label", s.getName()))
- .add(new AjaxEventBehavior("click") {
- private static final long serialVersionUID = 1L;
+ Button btn = new Button("oauthBtn") {
+ private static final long serialVersionUID = 1L;
- @Override
- protected void onEvent(AjaxRequestTarget target) {
- SignInPage.showAuth(s, SignInDialog.this);
- }
- });
- item.add(btn);
+ @Override
+ public void onSubmit() {
+ showAuth(s, SignInDialog.this);
+ }
+ };
+ Component icon = new Image("icon", Model.of(""))
+ .setVisible(!Strings.isEmpty(s.getIconUrl()))
+ .add(AttributeModifier.replace("src", s.getIconUrl()));
+ btn.add(icon, new Label("label", s.getName()));
+ item.add(btn.setDefaultFormProcessing(false)); //skip all rules, go to redirect
}
}).setVisible(allowOAuthLogin()));
}