diff --git a/dmp-frontend/src/app/app.component.html b/dmp-frontend/src/app/app.component.html
index a1039912d..ad8c4aec5 100644
--- a/dmp-frontend/src/app/app.component.html
+++ b/dmp-frontend/src/app/app.component.html
@@ -18,7 +18,7 @@
-
Digital Management Plans
+ Data Management Plans Creator
-
diff --git a/dmp-frontend/src/app/form/dynamic-form.component.ts b/dmp-frontend/src/app/form/dynamic-form.component.ts
index 491984e9e..ac4507d15 100644
--- a/dmp-frontend/src/app/form/dynamic-form.component.ts
+++ b/dmp-frontend/src/app/form/dynamic-form.component.ts
@@ -182,6 +182,7 @@ export class DynamicFormComponent implements OnInit {
private patchForm(flatList : any){
+ debugger;
for (var prop in flatList) {
if (flatList.hasOwnProperty(prop)) {
if(prop.endsWith('.id')||prop.endsWith('.answer')||prop.endsWith('.value')) continue;
diff --git a/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts b/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
index 316c22035..2879a7f37 100644
--- a/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
+++ b/dmp-frontend/src/app/login/googgle-sign-in/googgle-sign-in.component.ts
@@ -72,14 +72,6 @@ export class GooggleSignInComponent implements OnInit, AfterViewInit {
this.googleInit();
}
-/*
- signOut() {
- var auth2 = gapi.auth2.getAuthInstance();
- auth2.signOut().then(function () {
- console.log('User signed out.');
- });
- }
-*/
}
diff --git a/dmp-frontend/src/app/services/interceptor.ts b/dmp-frontend/src/app/services/interceptor.ts
index 9ac5e9d7e..79605bb69 100644
--- a/dmp-frontend/src/app/services/interceptor.ts
+++ b/dmp-frontend/src/app/services/interceptor.ts
@@ -2,12 +2,12 @@ import {Injectable} from '@angular/core';
import {Observable} from 'rxjs/Observable';
import {HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpResponse, HttpErrorResponse} from '@angular/common/http';
import { TokenService, TokenProvider } from './login/token.service';
-
+import {Router} from '@angular/router';
@Injectable()
export class GlobalInterceptor implements HttpInterceptor {
- constructor(public tokenService: TokenService) {}
+ constructor(public tokenService: TokenService, private router : Router) {}
intercept(req: HttpRequest, next: HttpHandler): Observable> {
@@ -21,6 +21,7 @@ export class GlobalInterceptor implements HttpInterceptor {
if (err instanceof HttpErrorResponse) {
if (err.status === 401) {
this.tokenService.logout();
+ this.router.navigate(['/dmps'], { queryParams: { /*returnUrl: this.state.url*/ }});
}
}
});
diff --git a/dmp-frontend/src/index.html b/dmp-frontend/src/index.html
index c01e0f2ae..d39263e5f 100644
--- a/dmp-frontend/src/index.html
+++ b/dmp-frontend/src/index.html
@@ -4,7 +4,7 @@
- Digital Management Plans Creator APP
+ Data Management Plans Creator