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

Merge branch 'master' into improve-support-for-hal-links

Browse Source
This commit is contained in:
Art Lowel
2017-10-17 10:25:23 +02:00
parent f2bce8fc2a 311fef21f4
commit 0529bb17f8
35 changed files with 1231 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/+collection-page/collection-page.component.ts
View File

@@ -12,6 +12,8 @@ import { Bitstream } from '../core/shared/bitstream.model';
import { Collection } from '../core/shared/collection.model';
import { Item } from '../core/shared/item.model';
import { MetadataService } from '../core/metadata/metadata.service';
import { fadeIn, fadeInOut } from '../shared/animations/fade';
import { hasValue, isNotEmpty } from '../shared/empty.util';
import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
@@ -35,9 +37,12 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
private subs: Subscription[] = [];
private collectionId: string;
constructor(private collectionDataService: CollectionDataService,
private itemDataService: ItemDataService,
private route: ActivatedRoute) {
constructor(
private collectionDataService: CollectionDataService,
private itemDataService: ItemDataService,
private metadata: MetadataService,
private route: ActivatedRoute
) {
this.paginationConfig = new PaginationComponentOptions();
this.paginationConfig.id = 'collection-page-pagination';
this.paginationConfig.pageSize = 5;
@@ -50,12 +55,13 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
Observable.combineLatest(
this.route.params,
this.route.queryParams,
(params, queryParams,) => {
(params, queryParams, ) => {
return Object.assign({}, params, queryParams);
})
.subscribe((params) => {
this.collectionId = params.id;
this.collectionData = this.collectionDataService.findById(this.collectionId);
this.metadata.processRemoteData(this.collectionData);
this.subs.push(this.collectionData.payload.subscribe((collection) => this.logoData = collection.logo));
const page = +params.page || this.paginationConfig.currentPage;