diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs index 7184a4b05..76b268657 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs @@ -8,6 +8,7 @@ using System; using System.Threading; using System.Threading.Tasks; +using Newtonsoft.Json.Bson; using NodaTime; using Orleans; using Orleans.Runtime; @@ -77,7 +78,9 @@ namespace Squidex.Domain.Apps.Entities.Contents if (job != null) { - var command = new ChangeContentStatus { ContentId = content.Id, Status = job.Status, Actor = job.ScheduledBy, JobId = job.Id }; + var command = new ChangeContentStatus { ContentId = content.Id, Status = job.Status, JobId = job.Id }; + + command.Actor = job.ScheduledBy; await commandBus.PublishAsync(command); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs index 9dde82eeb..5c8c0f109 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs @@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Entities.Contents private bool IsTrue(WorkflowCondition condition, NamedContentData data, ClaimsPrincipal user) { - if (condition?.Roles != null) + if (condition?.Roles != null && user != null) { if (!user.Claims.Any(x => x.Type == ClaimTypes.Role && condition.Roles.Contains(x.Value))) {