From 226420a999f34e32b5629bc77b9831b570f14b56 Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 23 Sep 2020 18:30:00 +0300 Subject: [PATCH] Makes edit button of overview pages open in the same tab window --- .../app/ui/dataset/overview/dataset-overview.component.ts | 5 +++-- .../src/app/ui/dmp/overview/dmp-overview.component.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts index 736d84e48..a1cfa2d47 100644 --- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts +++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts @@ -237,8 +237,9 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { editClicked(dataset: DatasetOverviewModel) { if (dataset.public) { - let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id]); - window.open(url.toString(), '_blank'); + this.router.navigate(['/datasets/publicEdit/', dataset.id]); + // let url = this.router.createUrlTree(['/datasets/publicEdit/', dataset.id]); + // window.open(url.toString(), '_blank'); } else { this.router.navigate(['/datasets/edit/', dataset.id]); // let url = this.router.createUrlTree(['/datasets/edit/', dataset.id]); diff --git a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts index d480a4e44..d0997cb6a 100644 --- a/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts +++ b/dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts @@ -173,8 +173,9 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { } editClicked(dmp: DmpOverviewModel) { - let url = this.router.createUrlTree(['/plans/edit/', dmp.id]); - window.open(url.toString(), '_blank'); + this.router.navigate(['/plans/edit/', dmp.id]); + // let url = this.router.createUrlTree(['/plans/edit/', dmp.id]); + // window.open(url.toString(), '_blank'); } cloneOrNewVersionClicked(dmp: DmpOverviewModel, isNewVersion: boolean) {