2 bug fixes: (#633)

376
Self-referential loop in CustomSchemaOptionsExtensionInfo
https://github.com/elsa-workflows/elsa-core/issues/376

331
"Input" is the property of workflowinstance,but it is empty in database
https://github.com/elsa-workflows/elsa-core/issues/331

Co-authored-by: DiGregorio, Stephen <SDiGregorio@allegromicro.com>
This commit is contained in:
steved 2021-02-15 12:06:43 -05:00 committed by GitHub
parent 0a36fadb7d
commit 3c63108dd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Elsa.Comparers;
@ -71,7 +71,8 @@ namespace Elsa.Services.Models
AbortedAt = AbortedAt,
Activities = activities,
Scope = Scope,
Input = Input,
BlockingActivities = new HashSet<BlockingActivity>(
BlockingActivities.Select(x => new BlockingActivity(x.Id, x.Type)),
new BlockingActivityEqualityComparer()
@ -99,6 +100,7 @@ namespace Elsa.Services.Models
AbortedAt = instance.AbortedAt;
ExecutionLog = instance.ExecutionLog.ToList();
Scope = instance.Scope;
Input = Input;
BlockingActivities =
new HashSet<IActivity>(instance.BlockingActivities.Select(x => activityLookup[x.ActivityId]));

View file

@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using Microsoft.EntityFrameworkCore.Infrastructure;
@ -24,7 +24,7 @@ namespace Elsa.Persistence.EntityFrameworkCore.CustomSchema
{
get
{
if (!string.IsNullOrWhiteSpace(LogFragment))
if (!string.IsNullOrWhiteSpace(logFragment))
return logFragment;
if (Extension.ContextCustomSchema != null && Extension.ContextCustomSchema.UseCustomSchema)