Merge branch 'master' into w2p-62769_Bitstream-format-registry

Conflicts:
	src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
	src/app/core/core.module.ts
	src/app/core/registry/registry-bitstreamformats-response.model.ts
	src/app/core/registry/registry.service.ts
	src/app/core/shared/bitstream-format.model.ts
This commit is contained in:
Yana De Pauw
2019-08-06 17:22:03 +02:00
458 changed files with 4716 additions and 2583 deletions

View File

@@ -1,4 +1,4 @@
import { CacheableObject } from '../cache/object-cache.reducer';
import { CacheableObject, TypedObject } from '../cache/object-cache.reducer';
import { ResourceType } from './resource-type';
import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
@@ -6,7 +6,9 @@ import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
* Model class for a Bitstream Format
*/
export class BitstreamFormat implements CacheableObject {
static type = new ResourceType('bitstreamformat');
bitstreamformat
/**
* Short description of this Bitstream Format
*/
@@ -42,11 +44,6 @@ export class BitstreamFormat implements CacheableObject {
*/
self: string;
/**
* A ResourceType representing the kind of Object of this BitstreamFormat
*/
type: ResourceType;
/**
* Universally unique identifier for this Bitstream Format
*/