Merge remote-tracking branch 'artlowel/rest-relationships' into w2p-40416_simple-item-page

Conflicts:
	src/app/core/shared/dspace-object.model.ts
This commit is contained in:
Lotte Hofstede
2017-04-27 13:12:23 +02:00
90 changed files with 2537 additions and 1664 deletions

View File

@@ -1,6 +1,8 @@
import { inheritSerialization, autoserialize, autoserializeAs } from "cerialize";
import { DSpaceObject } from "./dspace-object.model";
import { Collection } from "./collection.model";
import { RemoteData } from "../data/remote-data";
import { Bundle } from "./bundle.model";
@inheritSerialization(DSpaceObject)
export class Item extends DSpaceObject {
@@ -37,4 +39,6 @@ export class Item extends DSpaceObject {
*/
owner: Collection;
bundles: Array<RemoteData<Bundle>>
}