Merge branch 'rest-relationships' into w2p-40416_simple-item-page

Conflicts:
	src/app/core/cache/models/normalized-item.model.ts
	src/app/core/shared/item.model.ts
This commit is contained in:
Lotte Hofstede
2017-05-08 09:26:49 +02:00
14 changed files with 110 additions and 59 deletions

View File

@@ -1,10 +1,8 @@
import { inheritSerialization } from "cerialize";
import { DSpaceObject } from "./dspace-object.model";
import { Bitstream } from "./bitstream.model";
import { Item } from "./item.model";
import { RemoteData } from "../data/remote-data";
@inheritSerialization(DSpaceObject)
export class Bundle extends DSpaceObject {
/**
* The primary bitstream of this Bundle