[master]: Add dashboard in role verification
This commit is contained in:
parent
d490fa560e
commit
e6fe8c7390
|
@ -53,7 +53,8 @@ import {ConfigurationService} from "../openaireLibrary/utils/configuration/confi
|
||||||
No {{entities.country}} {{entities.stakeholder}} yet.
|
No {{entities.country}} {{entities.stakeholder}} yet.
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [service]="'irish'" [relativeTo]="null"></role-verification>
|
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [dashboard]="'National Open Access Monitor, Ireland'"
|
||||||
|
[type]="stakeholder.type" [service]="'irish'" [relativeTo]="null"></role-verification>
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
export class NationalComponent extends StakeholderBaseComponent implements OnInit {
|
export class NationalComponent extends StakeholderBaseComponent implements OnInit {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit e6d03d324f698f0de61e7a67f96314c6922d95f7
|
Subproject commit 0111ea668179f643ed4ac5b91881d9185733b8e8
|
|
@ -95,7 +95,8 @@ import {Irish} from "../shared/irish";
|
||||||
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
|
<div *ngIf="!this.alias || this.stakeholder" class="uk-margin-medium-top uk-margin-medium-bottom">
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
</div>
|
</div>
|
||||||
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [service]="'irish'" [relativeTo]="null"></role-verification>
|
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [dashboard]="'National Open Access Monitor, Ireland'"
|
||||||
|
[service]="'irish'" [relativeTo]="null"></role-verification>
|
||||||
</div>
|
</div>
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
|
|
|
@ -63,7 +63,8 @@ import {Irish} from "../shared/irish";
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [service]="'irish'" [relativeTo]="null"></role-verification>
|
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [service]="'irish'"
|
||||||
|
[relativeTo]="null" [dashboard]="'National Open Access Monitor, Ireland'"></role-verification>
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
export class RfoComponent extends StakeholderBaseComponent implements OnInit {
|
export class RfoComponent extends StakeholderBaseComponent implements OnInit {
|
||||||
|
|
|
@ -64,7 +64,8 @@ import {Role} from "../openaireLibrary/login/utils/helper.class";
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="type" [service]="'irish'" [relativeTo]="null"></role-verification>
|
<role-verification *ngIf="stakeholder" [id]="stakeholder.alias" [name]="stakeholder.name" [type]="stakeholder.type" [dashboard]="'National Open Access Monitor, Ireland'"
|
||||||
|
[service]="'irish'" [relativeTo]="null"></role-verification>
|
||||||
`
|
`
|
||||||
})
|
})
|
||||||
export class RpoComponent extends StakeholderBaseComponent implements OnInit {
|
export class RpoComponent extends StakeholderBaseComponent implements OnInit {
|
||||||
|
@ -73,7 +74,6 @@ export class RpoComponent extends StakeholderBaseComponent implements OnInit {
|
||||||
isSearch: boolean = false;
|
isSearch: boolean = false;
|
||||||
loading: boolean = false;
|
loading: boolean = false;
|
||||||
openaireEntities = OpenaireEntities;
|
openaireEntities = OpenaireEntities;
|
||||||
type: string;
|
|
||||||
|
|
||||||
constructor(private stakeholderService: StakeholderService,
|
constructor(private stakeholderService: StakeholderService,
|
||||||
private _customFilterService: CustomFilterService,
|
private _customFilterService: CustomFilterService,
|
||||||
|
@ -106,7 +106,6 @@ export class RpoComponent extends StakeholderBaseComponent implements OnInit {
|
||||||
this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(stakeholder => {
|
this.subscriptions.push(this.stakeholderService.getStakeholder(this.alias, true).subscribe(stakeholder => {
|
||||||
this.stakeholder = stakeholder;
|
this.stakeholder = stakeholder;
|
||||||
if (this.stakeholder && this.stakeholder.type === 'organization') {
|
if (this.stakeholder && this.stakeholder.type === 'organization') {
|
||||||
this.type = Role.mapType(this.stakeholder.type);
|
|
||||||
this.setProperties(this.stakeholder.alias, this.stakeholder.type, this.configurationService);
|
this.setProperties(this.stakeholder.alias, this.stakeholder.type, this.configurationService);
|
||||||
LinksResolver.resetProperties();
|
LinksResolver.resetProperties();
|
||||||
LinksResolver.setSearchAndResultLanding("rpo/" + this.stakeholder.alias);
|
LinksResolver.setSearchAndResultLanding("rpo/" + this.stakeholder.alias);
|
||||||
|
|
Loading…
Reference in New Issue