diff --git a/login/userMini.component.ts b/login/userMini.component.ts index f0ab2e38..5f8cc97e 100644 --- a/login/userMini.component.ts +++ b/login/userMini.component.ts @@ -81,6 +81,7 @@ export class UserMiniComponent { @Input() logInUrl; @Input() logOutUrl; @Input() cookieDomain; + @Input() communityId = null; public redirectUrl: string = ""; sub:any; @@ -133,8 +134,13 @@ export class UserMiniComponent { } logIn(){ - Session.setReloadUrl(location.protocol +"//"+location.host, location.pathname, location.search); - window.location.href = this.logInUrl + if(this.communityId && this.communityId === 'connect') { + Session.setReloadUrl(location.protocol +"//"+location.host, '/myCommunities', null); + } + else { + Session.setReloadUrl(location.protocol +"//"+location.host, location.pathname, location.search); + } + window.location.href = this.logInUrl; } onClick(id: string) { diff --git a/sharedComponents/navigationBar.component.html b/sharedComponents/navigationBar.component.html index 04fd6161..ef17e906 100644 --- a/sharedComponents/navigationBar.component.html +++ b/sharedComponents/navigationBar.component.html @@ -69,7 +69,7 @@ - + @@ -196,7 +196,7 @@ - +