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

Fixed merge issues

Browse Source
This commit is contained in:
Giuseppe
2018-10-17 12:25:46 +02:00
parent 8bc7d31864
commit 7b483ce052
43 changed files with 295 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/core/shared/collection.model.ts
View File

@@ -5,6 +5,7 @@ import { RemoteData } from '../data/remote-data';
import { Observable } from 'rxjs/Observable';
import { License } from './license.model';
import { ResourcePolicy } from './resource-policy.model';
import { PaginatedList } from '../data/paginated-list';
export class Collection extends DSpaceObject {
@@ -66,7 +67,7 @@ export class Collection extends DSpaceObject {
/**
* The default access conditions of this Collection
*/
defaultAccessConditions: Observable<RemoteData<ResourcePolicy[]>>;
defaultAccessConditions: Observable<RemoteData<PaginatedList<ResourcePolicy>>>;
/**
* An array of Collections that are direct parents of this Collection