You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by mg...@apache.org on 2015/01/13 22:13:34 UTC
isis git commit: ISIS-1010 Skip sign in page if there is a user
session and go directly to the home page instead
Repository: isis
Updated Branches:
refs/heads/master 38d77f75b -> 571bde0a8
ISIS-1010 Skip sign in page if there is a user session and go directly to the home page instead
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/571bde0a
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/571bde0a
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/571bde0a
Branch: refs/heads/master
Commit: 571bde0a805c9d15e7617edb173b6c696e10195a
Parents: 38d77f7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Jan 13 23:12:40 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Jan 13 23:12:40 2015 +0200
----------------------------------------------------------------------
.../viewer/wicket/ui/pages/login/WicketSignInPage.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/571bde0a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
index b0de663..1ac4cb4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
@@ -19,6 +19,9 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
+import org.apache.isis.core.runtime.system.context.IsisContext;
+import org.apache.isis.viewer.wicket.model.models.PageType;
+import org.apache.isis.viewer.wicket.ui.pages.PageNavigationService;
import org.apache.wicket.authroles.authentication.panel.SignInPanel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.cookies.CookieUtils;
@@ -26,6 +29,8 @@ import org.apache.wicket.util.string.Strings;
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.pages.accmngt.AccountManagementPageAbstract;
+import javax.inject.Inject;
+
/**
* Boilerplate, pick up our HTML and CSS.
*/
@@ -44,6 +49,10 @@ public class WicketSignInPage extends AccountManagementPageAbstract {
public WicketSignInPage(final PageParameters parameters, ExceptionModel exceptionModel) {
super(parameters, exceptionModel);
+
+ if (IsisContext.inSession()) {
+ pageNavigationService.restartAt(PageType.HOME);
+ }
}
@Override
@@ -90,4 +99,7 @@ public class WicketSignInPage extends AccountManagementPageAbstract {
add(signInPanel);
return signInPanel;
}
+
+ @Inject
+ private PageNavigationService pageNavigationService;
}