From 5d13d0e97af51dc652450f2fdbc06c96a3a1804f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 28 Jun 2019 17:23:05 +0200 Subject: [PATCH] Fixed content creation. --- .../Api/Controllers/Contents/ContentsController.cs | 2 +- .../Api/Controllers/Contents/Models/ContentDto.cs | 9 ++++++--- .../framework/angular/forms/tag-editor.component.ts | 10 +++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs index 4ff83533c..095be8d07 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/ContentsController.cs @@ -442,7 +442,7 @@ namespace Squidex.Areas.Api.Controllers.Contents var context = await CommandBus.PublishAsync(command); var result = context.Result(); - var response = ContentDto.FromContent(null, result, this); + var response = ContentDto.FromContent(Context, result, this); return response; } diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs index f7f20acde..0725239e4 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Models/ContentDto.cs @@ -153,11 +153,14 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models AddDeleteLink("delete", controller.Url(x => nameof(x.DeleteContent), values)); } - foreach (var next in content.Nexts) + if (content.Nexts != null) { - if (controller.HasPermission(Helper.StatusPermission(app, schema, next.Status))) + foreach (var next in content.Nexts) { - AddPutLink($"status/{next.Status}", controller.Url(x => nameof(x.PutContentStatus), values), next.Color); + if (controller.HasPermission(Helper.StatusPermission(app, schema, next.Status))) + { + AddPutLink($"status/{next.Status}", controller.Url(x => nameof(x.PutContentStatus), values), next.Color); + } } } diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index 90d837302..41ebf7d80 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -221,6 +221,10 @@ export class TagEditorComponent extends StatefulControlComponent i return; } + if (!this.inputElement.nativeElement) { + return; + } + if (!canvas) { canvas = document.createElement('canvas'); } @@ -231,13 +235,13 @@ export class TagEditorComponent extends StatefulControlComponent i if (ctx) { ctx.font = CACHED_FONT; - const text = this.inputElement.nativeElement.value; - const textKey = `${text}§${this.placeholder}§${ctx.font}`; + const textValue = this.inputElement.nativeElement.value; + const textKey = `${textValue}§${this.placeholder}§${ctx.font}`; let width = CACHED_SIZES[textKey]; if (!width) { - const widthText = ctx.measureText(text).width; + const widthText = ctx.measureText(textValue).width; const widthPlaceholder = ctx.measureText(this.placeholder).width; width = Math.max(widthText, widthPlaceholder);