Browse Source

Fix disabled change and a few roslyn warnings.

pull/892/head
Sebastian 4 years ago
parent
commit
8761ce4d6e
  1. 2
      backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs
  2. 12
      backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs
  3. 4
      frontend/src/app/features/content/pages/content/editor/content-field.component.html

2
backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs

@ -21,7 +21,7 @@ namespace Squidex.Infrastructure.Orleans
public async Task Invoke(IIncomingGrainCallContext context) public async Task Invoke(IIncomingGrainCallContext context)
{ {
var name = $"Grain/{context.ImplementationMethod?.DeclaringType.FullName}/{context.ImplementationMethod?.Name}"; var name = $"Grain/{context.ImplementationMethod?.DeclaringType?.FullName}/{context.ImplementationMethod?.Name}";
using (Telemetry.Activities.StartActivity(name)) using (Telemetry.Activities.StartActivity(name))
{ {

12
backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs

@ -1,9 +1,11 @@
using System; // ==========================================================================
// Squidex Headless CMS
// ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt)
// All rights reserved. Licensed under the MIT license.
// ==========================================================================
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xunit; using Xunit;
namespace Squidex.Infrastructure.Tasks namespace Squidex.Infrastructure.Tasks

4
frontend/src/app/features/content/pages/content/editor/content-field.component.html

@ -23,7 +23,7 @@
<ng-container *ngIf="showAllControls; else singleControl"> <ng-container *ngIf="showAllControls; else singleControl">
<div class="form-group" *ngFor="let language of languages"> <div class="form-group" *ngFor="let language of languages">
<sqx-field-editor <sqx-field-editor
[canUnset]="!formModel.field.isDisabled" [canUnset]="!(isDisabled | async)"
[displaySuffix]="prefix(language)" [displaySuffix]="prefix(language)"
[form]="form" [form]="form"
[formContext]="formContext" [formContext]="formContext"
@ -38,7 +38,7 @@
<ng-template #singleControl> <ng-template #singleControl>
<sqx-field-editor <sqx-field-editor
[canUnset]="!formModel.field.isDisabled" [canUnset]="!(isDisabled | async)"
[form]="form" [form]="form"
[formContext]="formContext" [formContext]="formContext"
[formLevel]="formLevel" [formLevel]="formLevel"

Loading…
Cancel
Save