hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reorder-name-variants' into metadata-and-relationships-combined-in-submission

Browse Source
This commit is contained in:
lotte
2020-01-14 16:16:17 +01:00
parent e768169add 78f9d62e00
commit ab966c08ac
122 changed files with 5544 additions and 1582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/shared/form/builder/form-builder.service.ts
View File

@@ -10,10 +10,8 @@ import {
DynamicFormArrayModel,
DynamicFormControlModel,
DynamicFormGroupModel,
DynamicFormService,
DynamicFormValidationService,
DynamicPathable,
JSONUtils,
DynamicFormService, DynamicFormValidationService,
DynamicPathable, parseReviver,
} from '@ng-dynamic-forms/core';
import { isObject, isString, mergeWith } from 'lodash';
@@ -205,7 +203,7 @@ export class FormBuilderService extends DynamicFormService {
modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {}, submissionScope?: string, readOnly = false): DynamicFormControlModel[] | never {
let rows: DynamicFormControlModel[] = [];
const rawData = typeof json === 'string' ? JSON.parse(json, JSONUtils.parseReviver) : json;
const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
if (rawData.rows && !isEmpty(rawData.rows)) {
rawData.rows.forEach((currentRow) => {