diff --git a/dmp-frontend/src/app/ui/auth/login/login.component.ts b/dmp-frontend/src/app/ui/auth/login/login.component.ts
index e5b243627..17ed6d2ac 100644
--- a/dmp-frontend/src/app/ui/auth/login/login.component.ts
+++ b/dmp-frontend/src/app/ui/auth/login/login.component.ts
@@ -32,6 +32,7 @@ declare const FB: any;
})
export class LoginComponent extends BaseComponent implements OnInit, AfterViewInit {
+ @Input() redirect: boolean = true;
@Input() mergeUsers: boolean;
public auth2: any;
@@ -58,7 +59,7 @@ export class LoginComponent extends BaseComponent implements OnInit, AfterViewIn
) { super(); }
ngOnInit(): void {
- if(this.authService.current()){
+ if(this.authService.current() && (this.redirect == true)){
this.router.navigate(['home']);
}
this.matomoService.trackPageView('loginPage');
diff --git a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
index 29e850e27..b1ed8babb 100644
--- a/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
+++ b/dmp-frontend/src/app/ui/dmp/clone/clone-dialog/clone-dialog.component.html
@@ -59,7 +59,7 @@
- {{dataset.label}}
+ {{dataset.label}}
diff --git a/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html b/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html
index 2478e5925..bd3776d6f 100644
--- a/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html
+++ b/dmp-frontend/src/app/ui/user-profile/add-account/add-account-dialog.component.html
@@ -3,7 +3,7 @@
diff --git a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
index db7c61a1c..8e361894f 100644
--- a/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
+++ b/dmp-frontend/src/app/ui/user-profile/user-profile.component.ts
@@ -31,6 +31,7 @@ import { FormValidationErrorsDialogComponent } from '@common/forms/form-validati
import { SnackBarNotificationLevel, UiNotificationService } from '@app/core/services/notification/ui-notification-service';
import { MatomoService } from '@app/core/services/matomo/matomo-service';
import { HttpClient } from '@angular/common/http';
+import {PopupNotificationDialogComponent} from "@app/library/notification/popup/popup-notification.component";
const availableLanguages: any[] = require('../../../assets/resources/language.json');
@@ -306,7 +307,14 @@ export class UserProfileComponent extends BaseComponent implements OnInit, OnDes
dialogRef.afterClosed().pipe(takeUntil(this._destroyed)).subscribe(result => {
if (result) {
this.mergeEmailConfirmation.sendConfirmationEmail(result).pipe(takeUntil(this._destroyed))
- .subscribe(res => { }, err => { });
+ .subscribe(res => {
+ this.dialog.open(PopupNotificationDialogComponent, {
+ data: {
+ title: this.language.instant('USER-PROFILE.MERGING-EMAILS-DIALOG.TITLE'),
+ message: this.language.instant('USER-PROFILE.MERGING-EMAILS-DIALOG.MESSAGE')
+ }, maxWidth: '30em'
+ });
+ }, err => { });
}
});
}
diff --git a/dmp-frontend/src/assets/i18n/de.json b/dmp-frontend/src/assets/i18n/de.json
index ade6eb5d7..5ce2a46a5 100644
--- a/dmp-frontend/src/assets/i18n/de.json
+++ b/dmp-frontend/src/assets/i18n/de.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Abmeldung"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Einstellungen",
"TIMEZONE": "Zeitzone",
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 74c4c6a65..5dec63222 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Log Out"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Settings",
"TIMEZONE": "Time Zone",
diff --git a/dmp-frontend/src/assets/i18n/es.json b/dmp-frontend/src/assets/i18n/es.json
index 8a9198093..506b57f3f 100644
--- a/dmp-frontend/src/assets/i18n/es.json
+++ b/dmp-frontend/src/assets/i18n/es.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Cerrar la sesión"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Configuración",
"TIMEZONE": "Zona horaria",
diff --git a/dmp-frontend/src/assets/i18n/gr.json b/dmp-frontend/src/assets/i18n/gr.json
index 45494793b..cea3fa195 100644
--- a/dmp-frontend/src/assets/i18n/gr.json
+++ b/dmp-frontend/src/assets/i18n/gr.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Αποσύνδεση"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Ρυθμίσεις",
"TIMEZONE": "Ζώνη Ώρας",
diff --git a/dmp-frontend/src/assets/i18n/hr.json b/dmp-frontend/src/assets/i18n/hr.json
index 00f9ddbd3..950ca495d 100644
--- a/dmp-frontend/src/assets/i18n/hr.json
+++ b/dmp-frontend/src/assets/i18n/hr.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Odjava"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Postavke",
"TIMEZONE": "Vremenska zona",
diff --git a/dmp-frontend/src/assets/i18n/pt.json b/dmp-frontend/src/assets/i18n/pt.json
index bfd4dfa10..2c7268bf2 100644
--- a/dmp-frontend/src/assets/i18n/pt.json
+++ b/dmp-frontend/src/assets/i18n/pt.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Terminar Sessão"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Definições",
"TIMEZONE": "Fuso horário",
diff --git a/dmp-frontend/src/assets/i18n/sk.json b/dmp-frontend/src/assets/i18n/sk.json
index 7060bfffe..a3fe681c8 100644
--- a/dmp-frontend/src/assets/i18n/sk.json
+++ b/dmp-frontend/src/assets/i18n/sk.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Odhlásiť sa"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Nastavenia",
"TIMEZONE": "Časové pásmo",
diff --git a/dmp-frontend/src/assets/i18n/sr.json b/dmp-frontend/src/assets/i18n/sr.json
index f10a77251..d2debf362 100644
--- a/dmp-frontend/src/assets/i18n/sr.json
+++ b/dmp-frontend/src/assets/i18n/sr.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Odjavite se"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Podešavanja",
"TIMEZONE": "Vremenska zona",
diff --git a/dmp-frontend/src/assets/i18n/tr.json b/dmp-frontend/src/assets/i18n/tr.json
index 9d5f7d296..f15de3cac 100644
--- a/dmp-frontend/src/assets/i18n/tr.json
+++ b/dmp-frontend/src/assets/i18n/tr.json
@@ -1657,6 +1657,10 @@
"LOG-OUT": "Çıkış Yap"
},
"USER-PROFILE": {
+ "MERGING-EMAILS-DIALOG": {
+ "TITLE": "Link new account",
+ "MESSAGE": "An email to verify this action has been sent to you. Once accepted, you will be able to see your accounts merged. The last email account that you merge will be the one containing all of your DMP records and activity in Argos."
+ },
"SETTINGS": {
"TITLE": "Ayarlar",
"TIMEZONE": "Zaman Dilimi",