Merge branch 'master' into clean-relationships-in-submission

This commit is contained in:
lotte
2019-12-16 10:45:21 +01:00
118 changed files with 3304 additions and 599 deletions

View File

@@ -16,7 +16,7 @@ import { SubmissionService } from '../../submission.service';
import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
import { CollectionDataService } from '../../../core/data/collection-data.service';
import { FindAllOptions } from '../../../core/data/request.models';
import { FindListOptions } from '../../../core/data/request.models';
/**
* An interface to represent a collection entry
@@ -185,7 +185,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
map((collectionRD: RemoteData<Collection>) => collectionRD.payload.name)
);
const findOptions: FindAllOptions = {
const findOptions: FindListOptions = {
elementsPerPage: 1000
};