From abc114b8ab41e4d8b3e624145f2d1129f5f8f69e Mon Sep 17 00:00:00 2001 From: annabakouli Date: Mon, 8 Jan 2018 17:15:45 +0200 Subject: [PATCH] no message --- dmp-backend/src/main/resources/application.properties | 6 ++---- dmp-frontend/src/app/login/login.component.ts | 8 +++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dmp-backend/src/main/resources/application.properties b/dmp-backend/src/main/resources/application.properties index 701d53897..7fa916e55 100644 --- a/dmp-backend/src/main/resources/application.properties +++ b/dmp-backend/src/main/resources/application.properties @@ -6,8 +6,7 @@ ##########################Persistence########################################## database.driver-class-name=org.postgresql.Driver database.url = jdbc:postgresql://develdb1.madgik.di.uoa.gr:5432/dmptool -database.username = dmptool -database.password = dmpt00lu$r + ##########################/Persistence########################################## ###################Allowed Proxy Service Host ############################ @@ -18,8 +17,7 @@ configuration.externalUrls = file:///C:\\Users\\ikalyvas\\Documents\\Projects\\O ########################/Email############################# spring.mail.default-encoding=UTF-8 spring.mail.host=smtp.gmail.com -spring.mail.username=kalivasioan@gmail.com -spring.mail.password=A3b*1*92 + spring.mail.port=587 spring.mail.protocol=smtp spring.mail.test-connection=false diff --git a/dmp-frontend/src/app/login/login.component.ts b/dmp-frontend/src/app/login/login.component.ts index e12a84efd..45e3090b0 100644 --- a/dmp-frontend/src/app/login/login.component.ts +++ b/dmp-frontend/src/app/login/login.component.ts @@ -1,5 +1,5 @@ import { HttpClient } from '@angular/common/http'; -import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable } from '@angular/core'; +import { Component, OnInit, ElementRef, AfterViewInit, VERSION, Injectable, NgZone } from '@angular/core'; import { Router, ActivatedRoute, Params } from "@angular/router"; import { MatPaginator, MatSort, MatSnackBar } from "@angular/material"; import { TranslateService } from "@ngx-translate/core"; @@ -21,7 +21,9 @@ export class LoginComponent implements OnInit { public authService: AuthService, public route: ActivatedRoute, public snackBar: MatSnackBar, - public language: TranslateService) { } + public language: TranslateService, + private zone: NgZone + ) { } ngOnInit() { gapi.load('auth2', () => { @@ -59,7 +61,7 @@ export class LoginComponent implements OnInit { }); this.route.queryParams.subscribe((params: Params) => { let redirectUrl = params['returnUrl'] ? params['returnUrl'] : '/'; - this.router.navigate([redirectUrl]); + this.zone.run(() => this.router.navigate([redirectUrl])); }) }