mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-18 23:43:01 +00:00
Fixes after rebasing from upstream/master
This commit is contained in:
@@ -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')
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
@@ -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'),
|
||||||
|
@@ -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>>;
|
||||||
|
@@ -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>>;
|
||||||
|
@@ -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>>;
|
||||||
}
|
}
|
||||||
|
@@ -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>>;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user