diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index eac367a..f3af762 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit eac367a8727e6abfc9107cba3fc4837e02d10e36 +Subproject commit f3af762dab9b3d489dd4f78c46f3537aff840efd diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 31d81e1..57e4590 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -44,10 +44,10 @@
@@ -79,7 +79,7 @@ -
+
@@ -145,10 +145,10 @@
@@ -190,7 +190,7 @@
-
+
@@ -416,7 +416,7 @@
- + You are about to delete "{{indicator.name ? indicator.name : indicator.indicatorPaths[0].parameters.title}}" indicator permanently.
@@ -440,7 +440,7 @@ Indicators of all profiles based on this default indicator, will not be marked as copied from default anymore. Are you sure you want to proceed? --> - + You are about to delete this section and its indicators permanently.
Sections of all profiles based on this default section and their contents, will be deleted as well. @@ -468,14 +468,3 @@
- - - - diff --git a/src/app/topic/indicators.component.ts b/src/app/topic/indicators.component.ts index bb7e6a3..1df9207 100644 --- a/src/app/topic/indicators.component.ts +++ b/src/app/topic/indicators.component.ts @@ -60,6 +60,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV public stakeholder: Stakeholder = null; @Input() public changed: Observable; + @Input() public user: User = null; public preview: string; public indicatorUtils: IndicatorUtils = new IndicatorUtils(); @@ -105,7 +106,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV constructor(private layoutService: LayoutService, private stakeholderService: StakeholderService, private statisticsService: StatisticsService, - private userManagementService: UserManagementService, private notificationService: NotificationService, private fb: FormBuilder, private router: Router, @@ -115,9 +115,6 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV } ngOnInit(): void { - this.subscriptions.push(this.userManagementService.getUserInfo().subscribe(user => { - this.user = user; - })); if (this.stakeholder) { this.setCharts(); this.setNumbers(); @@ -924,7 +921,7 @@ export class IndicatorsComponent implements OnInit, OnDestroy, OnChanges, AfterV } public get isCurator(): boolean { - return this.isAdministrator || Session.isMonitorCurator(this.user); + return this.isAdministrator || Session.isCurator(this.stakeholder.type, this.user); } refreshIndicator() { diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html index c62f741..ee6961a 100644 --- a/src/app/topic/topic.component.html +++ b/src/app/topic/topic.component.html @@ -1,4 +1,4 @@ -