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>> { get followLinks(): Array<FollowLinkConfig<Collection>> {
return [ return [
followLink('parentCommunity', undefined, followLink('parentCommunity', undefined, true,
followLink('parentCommunity') followLink('parentCommunity')
) )
]; ];

View File

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

View File

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

View File

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

View File

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

View File

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