hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 06:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-68729_List-version-history

Browse Source 
Conflicts:
	src/app/core/cache/models/normalized-item.model.ts
	src/app/core/core.module.ts
	src/app/core/shared/item.model.ts
This commit is contained in:
Kristof De Langhe
2020-02-25 14:34:56 +01:00
parent 0cb606877b a6f1a6d1ec
commit 254305652d
357 changed files with 6108 additions and 5128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/shared/item/item-versions/item-versions.component.ts
View File

@@ -13,6 +13,8 @@ import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
import { AlertType } from '../../alert/aletr-type';
import { hasValueOperator } from '../../empty.util';
import { followLink } from '../../utils/follow-link-config.model';
@Component({
selector: 'ds-item-versions',
@@ -101,7 +103,8 @@ export class ItemVersionsComponent implements OnInit {
this.versionsRD$ = observableCombineLatest(versionHistory$, this.currentPage$).pipe(
switchMap(([versionHistory, page]: [VersionHistory, number]) =>
this.versionHistoryService.getVersions(versionHistory.id,
new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })})))
new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })}),
followLink('item')))
);
this.hasEpersons$ = this.versionsRD$.pipe(
getAllSucceededRemoteData(),