Fixes after merge with master

This commit is contained in:
Giuseppe Digilio
2019-02-19 17:46:34 +01:00
parent 880d9ed069
commit f6fe2c3c3e
34 changed files with 164 additions and 238 deletions

View File

@@ -104,9 +104,9 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
onCollectionChange(submissionObject: SubmissionObject) {
this.collectionId = (submissionObject.collection as Collection).id;
if (this.definitionId !== submissionObject.submissionDefinition.name) {
if (this.definitionId !== (submissionObject.submissionDefinition as SubmissionDefinitionsModel).name) {
this.sections = submissionObject.sections;
this.submissionDefinition = submissionObject.submissionDefinition;
this.submissionDefinition = (submissionObject.submissionDefinition as SubmissionDefinitionsModel);
this.definitionId = this.submissionDefinition.name;
this.submissionService.resetSubmissionObject(
this.collectionId,