You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/07/01 10:29:31 UTC
[incubator-dlab] 03/04: [DLAB-823]: added placeholder to management
grid
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c5cf2c2e4dbae7a6ea3855081ba9cb91fd793542
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 1 13:28:52 2019 +0300
[DLAB-823]: added placeholder to management grid
---
.../src/main/resources/webapp/src/app/login/login.component.ts | 10 +++++-----
.../webapp/src/app/shared/navbar/navbar.component.html | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
index b456bf1..489acae 100644
--- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
@@ -50,11 +50,11 @@ export class LoginComponent implements OnInit, OnDestroy {
}
ngOnInit() {
- this.applicationSecurityService.isLoggedIn().subscribe(result => {
- console.log('LOGGED IN /login component');
+ // this.applicationSecurityService.isLoggedIn().subscribe(result => {
+ // console.log('LOGGED IN /login component');
- result && this.checkHealthStatusAndRedirect(result);
- });
+ // result && this.checkHealthStatusAndRedirect(result);
+ // });
}
ngOnDestroy() {
@@ -69,7 +69,7 @@ export class LoginComponent implements OnInit, OnDestroy {
.login(this.model)
.subscribe((result) => {
if (result) {
- this.checkHealthStatusAndRedirect(result);
+ this.appRoutingService.redirectToHomePage();
return true;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 10abf9c..c5a424f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -32,9 +32,9 @@
</div>
<div class="control-area" *ngIf="healthStatus">
- <a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
+ <!-- <a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
<span class="material-icons" ngClass="{{healthStatus.status || ''}}">radio_button_checked</span>
- </a>
+ </a> -->
<a class="statusbar" #info (click)="actions.toggle($event, info)" *ngIf="metadata">
<span class="material-icons meta">info</span>
</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org