Fixes after rebasing from upstream/master

This commit is contained in:
Marie Verdonck
2020-03-04 11:01:20 +01:00
parent 525c333e09
commit 677b3f63de
6 changed files with 11 additions and 21 deletions

View File

@@ -21,7 +21,7 @@ export class CollectionBreadcrumbResolver extends DSOBreadcrumbResolver<Collecti
*/
get followLinks(): Array<FollowLinkConfig<Collection>> {
return [
followLink('parentCommunity', undefined,
followLink('parentCommunity', undefined, true,
followLink('parentCommunity')
)
];

View File

@@ -21,8 +21,8 @@ export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
*/
get followLinks(): Array<FollowLinkConfig<Item>> {
return [
followLink('owningCollection', undefined,
followLink('parentCommunity', undefined,
followLink('owningCollection', undefined, true,
followLink('parentCommunity', undefined, true,
followLink('parentCommunity'))
),
followLink('bundles'),

View File

@@ -49,10 +49,8 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink(
'workflowitem',
null,
followLink('item', null, followLink('bundles')),
this.linkService.resolveLink(this.dso, followLink('workflowitem', null, true,
followLink('item', null, true, followLink('bundles')),
followLink('submitter')
));
this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;

View File

@@ -48,10 +48,8 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink(
'workflowitem',
null,
followLink('item', null, followLink('bundles')),
this.linkService.resolveLink(this.dso, followLink('workflowitem', null, true,
followLink('item', null, true, followLink('bundles')),
followLink('submitter')
));
this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;

View File

@@ -55,11 +55,8 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink(
'workflowitem',
null,
followLink('item'),
followLink('submitter')
this.linkService.resolveLink(this.dso, followLink('workflowitem', null, true,
followLink('item'), followLink('submitter')
));
this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
}

View File

@@ -58,11 +58,8 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
*/
ngOnInit() {
super.ngOnInit();
this.linkService.resolveLink(this.dso, followLink(
'workflowitem',
null,
followLink('item'),
followLink('submitter')
this.linkService.resolveLink(this.dso, followLink('workflowitem', null, true,
followLink('item'), followLink('submitter')
));
this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
}