From 82c5586067ae17355de339c54c4761c9bfd5411f Mon Sep 17 00:00:00 2001 From: Kristan Ntavidi Date: Wed, 30 Jun 2021 13:24:56 +0300 Subject: [PATCH] Dataset and dmp overview fix. * Fix edit issue when multiple users have ownership of the same dmp/dataset. (cherry picked from commit fd9d35aad3feaeecb342192abd66ceef2a826232) --- .../src/app/ui/dataset/overview/dataset-overview.component.ts | 2 +- dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 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 3ce790c8d..c17692525 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 @@ -164,7 +164,7 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit { setIsUserOwner() { if (this.dataset) { const principal: Principal = this.authentication.current(); - if (principal) this.isUserOwner = principal.id === this.dataset.users.find(x => x.role === Role.Owner).id; + if (principal) this.isUserOwner = !!this.dataset.users.find(x => (x.role === Role.Owner) && (principal.id === x.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 5e203919a..5ecfee18d 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 @@ -167,7 +167,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit { setIsUserOwner() { if (this.dmp) { const principal: Principal = this.authentication.current(); - if (principal) this.isUserOwner = principal.id === this.dmp.users.find(x => x.role === Role.Owner).id; + if (principal) this.isUserOwner = !!this.dmp.users.find(x => (x.role === Role.Owner) && (principal.id === x.id)); } }