From 044d452c68e9cccb5774fa31389a42a80d6c9760 Mon Sep 17 00:00:00 2001 From: Benjamin Barth Date: Mon, 18 Apr 2016 14:27:54 +0200 Subject: [PATCH] Fixed sign in button which is shown if you access the user details page when not signed in --- .../detailstab/UserProfileDetailsPresenter.java | 11 ++++++++--- .../profile/detailstab/UserProfileDetailsView.java | 3 ++- .../detailstab/UserProfileDetailsViewImpl.java | 9 +-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsPresenter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsPresenter.java index f78b38ca1f1..97ca4c126e7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsPresenter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsPresenter.java @@ -7,14 +7,14 @@ import com.sap.sse.security.ui.userprofile.shared.userdetails.UserDetailsPresent public class UserProfileDetailsPresenter implements UserProfileDetailsView.Presenter { private final UserProfileDetailsView view; + private final UserProfileView.Presenter userProfilePresenter; private final UserDetailsPresenter userDetailsPresenter; public UserProfileDetailsPresenter(UserProfileDetailsView view, UserProfileView.Presenter userProfilePresenter) { this.view = view; - + this.userProfilePresenter = userProfilePresenter; view.setPresenter(this); - - userDetailsPresenter = new UserDetailsPresenter(view.getUserDetailsView(), + this.userDetailsPresenter = new UserDetailsPresenter(view.getUserDetailsView(), userProfilePresenter.getAuthenticationManager(), userProfilePresenter.getUserManagementService(), userProfilePresenter.getMailVerifiedUrl()); } @@ -24,4 +24,9 @@ public class UserProfileDetailsPresenter implements UserProfileDetailsView.Prese view.getDecorator().setAuthenticationContext(authenticationContext); userDetailsPresenter.setAuthenticationContext(authenticationContext); } + + @Override + public void doTriggerLoginForm() { + userProfilePresenter.doTriggerLoginForm(); + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsView.java index b59ca898648..0c1da6e94cc 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsView.java @@ -3,6 +3,7 @@ package com.sap.sailing.gwt.home.desktop.places.user.profile.detailstab; import com.google.gwt.user.client.ui.IsWidget; import com.sap.sse.security.ui.authentication.app.AuthenticationContext; import com.sap.sse.security.ui.authentication.app.NeedsAuthenticationContext; +import com.sap.sse.security.ui.authentication.decorator.NotLoggedInPresenter; import com.sap.sse.security.ui.userprofile.shared.userdetails.UserDetailsView; public interface UserProfileDetailsView extends IsWidget { @@ -13,7 +14,7 @@ public interface UserProfileDetailsView extends IsWidget { NeedsAuthenticationContext getDecorator(); - public interface Presenter { + public interface Presenter extends NotLoggedInPresenter { void setAuthenticationContext(AuthenticationContext userManagementContext); } } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsViewImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsViewImpl.java index 9e371f2fee1..6353e4ac988 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsViewImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/user/profile/detailstab/UserProfileDetailsViewImpl.java @@ -6,7 +6,6 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.gwt.common.client.SharedResources; -import com.sap.sailing.gwt.home.desktop.places.user.profile.UserProfileView; import com.sap.sailing.gwt.home.shared.usermanagement.decorator.AuthorizedContentDecoratorDesktop; import com.sap.sse.security.ui.authentication.app.NeedsAuthenticationContext; import com.sap.sse.security.ui.userprofile.desktop.userdetails.UserAccountDetails; @@ -28,19 +27,13 @@ public class UserProfileDetailsViewImpl extends Composite implements UserProfile @UiField(provided = true) UserAccountDetails accountDetailsUi; - private UserProfileView.Presenter currentPresenter; - - - public UserProfileDetailsViewImpl() { - } - public UserDetailsView getUserDetailsView() { return accountDetailsUi; } @Override public void setPresenter(Presenter presenter) { - decoratorUi = new AuthorizedContentDecoratorDesktop(currentPresenter); + decoratorUi = new AuthorizedContentDecoratorDesktop(presenter); accountDetailsUi = new UserAccountDetails(SharedResources.INSTANCE); initWidget(ourUiBinder.createAndBindUi(this)); }