Browse Source

Closes #301

pull/303/head
Sebastian 8 years ago
parent
commit
2921c99875
  1. 14
      src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs
  2. 15
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts

14
src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs

@ -56,23 +56,23 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models
foreach (var fieldDto in Fields)
{
var fieldProperties = fieldDto?.Properties.ToProperties();
var field = SimpleMapper.Map(fieldDto, new CreateSchemaField { Properties = fieldProperties });
var rootProperties = fieldDto?.Properties.ToProperties();
var rootField = SimpleMapper.Map(fieldDto, new CreateSchemaField { Properties = rootProperties });
if (fieldDto.Nested != null)
{
field.Nested = new List<CreateSchemaNestedField>();
rootField.Nested = new List<CreateSchemaNestedField>();
foreach (var nestedFieldDto in fieldDto.Nested)
{
var nestedFieldProperties = nestedFieldDto?.Properties.ToProperties();
var nestedField = SimpleMapper.Map(fieldDto, new CreateSchemaNestedField { Properties = fieldProperties });
var nestedProperties = nestedFieldDto?.Properties.ToProperties();
var nestedField = SimpleMapper.Map(nestedFieldDto, new CreateSchemaNestedField { Properties = nestedProperties });
field.Nested.Add(nestedField);
rootField.Nested.Add(nestedField);
}
}
command.Fields.Add(field);
command.Fields.Add(rootField);
}
}

15
src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts

@ -5,6 +5,8 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/
// tslint:disable:no-shadowed-variable
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs';
@ -19,7 +21,8 @@ import {
ModalView,
PatternsState,
SchemaDetailsDto,
SchemasState
SchemasState,
Types
} from '@app/shared';
import {
@ -109,9 +112,17 @@ export class SchemaPageComponent implements OnDestroy, OnInit {
fields: this.schema.fields.map(field => {
const { fieldId, ...copy } = field;
if (Types.isArray(copy.nested)) {
for (let i = 0; i < copy.nested.length; i++) {
const { fieldId, parentId, ...nestedCopy } = copy.nested[i];
copy.nested[i] = <any>nestedCopy;
}
}
for (const key in copy.properties) {
if (copy.properties.hasOwnProperty(key)) {
if (!copy.properties[key]) {
if (!!copy.properties[key]) {
delete copy.properties[key];
}
}

Loading…
Cancel
Save