Browse Source

Fixes.

release/5.7
Sebastian 5 years ago
parent
commit
91d588d1cf
  1. 20
      backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.cs
  2. 7
      backend/src/Squidex/appsettings.json
  3. 10
      frontend/app/shared/state/contents.state.ts

20
backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.cs

@ -1,4 +1,4 @@
// ========================================================================== // ==========================================================================
// Squidex Headless CMS // Squidex Headless CMS
// ========================================================================== // ==========================================================================
// Copyright (c) Squidex UG (haftungsbeschraenkt) // Copyright (c) Squidex UG (haftungsbeschraenkt)
@ -265,11 +265,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
await operation.CheckTransitionAsync(c.Status); await operation.CheckTransitionAsync(c.Status);
} }
if (c.CheckReferrers && Snapshot.IsPublished())
{
await operation.CheckReferrersAsync();
}
if (!c.DoNotScript) if (!c.DoNotScript)
{ {
var newData = await operation.ExecuteChangeScriptAsync(c.Status, GetChange(c.Status)); var newData = await operation.ExecuteChangeScriptAsync(c.Status, GetChange(c.Status));
@ -291,6 +286,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
} }
} }
if (c.CheckReferrers && Snapshot.IsPublished())
{
await operation.CheckReferrersAsync();
}
if (!c.DoNotValidate && c.Status == Status.Published && operation.SchemaDef.Properties.ValidateOnPublish) if (!c.DoNotValidate && c.Status == Status.Published && operation.SchemaDef.Properties.ValidateOnPublish)
{ {
await operation.ValidateContentAndInputAsync(Snapshot.Data, c.OptimizeValidation, true); await operation.ValidateContentAndInputAsync(Snapshot.Data, c.OptimizeValidation, true);
@ -374,14 +374,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.DomainObject
operation.MustHavePermission(Permissions.AppContentsDeleteOwn); operation.MustHavePermission(Permissions.AppContentsDeleteOwn);
operation.MustNotDeleteSingleton(); operation.MustNotDeleteSingleton();
if (c.CheckReferrers) if (!c.DoNotScript)
{ {
await operation.CheckReferrersAsync(); await operation.ExecuteDeleteScriptAsync();
} }
if (!c.DoNotScript) if (c.CheckReferrers)
{ {
await operation.ExecuteDeleteScriptAsync(); await operation.CheckReferrersAsync();
} }
Delete(c); Delete(c);

7
backend/src/Squidex/appsettings.json

@ -347,7 +347,12 @@
/* /*
* True, to enable datadog integration. * True, to enable datadog integration.
*/ */
"datadog": false "datadog": false,
/*
* True, to enable application insights integraon.
*/
"applicationInsights": true
}, },
"assetStore": { "assetStore": {

10
frontend/app/shared/state/contents.state.ts

@ -341,9 +341,11 @@ export abstract class ContentsStateBase extends State<Snapshot> {
private bulkWithRetry(contents: ReadonlyArray<ContentDto>, job: Partial<BulkUpdateJobDto>, confirmTitle: string, confirmText: string, confirmKey: string): Observable<ReadonlyArray<BulkResultDto>> { private bulkWithRetry(contents: ReadonlyArray<ContentDto>, job: Partial<BulkUpdateJobDto>, confirmTitle: string, confirmText: string, confirmKey: string): Observable<ReadonlyArray<BulkResultDto>> {
return this.bulkMany(contents, true, job).pipe( return this.bulkMany(contents, true, job).pipe(
switchMap(results => { switchMap(results => {
const failed = contents.filter(x => isReferrerError(results.find(r => r.contentId === x.id)?.error)); const referrerFailures = results.filter(x => isReferrerError(x.error));
if (referrerFailures.length > 0) {
const failed = contents.filter(x => referrerFailures.find(r => r.contentId === x.id));
if (failed.length > 0) {
return this.dialogs.confirm(confirmTitle, confirmText, confirmKey).pipe( return this.dialogs.confirm(confirmTitle, confirmText, confirmKey).pipe(
switchMap(confirmed => { switchMap(confirmed => {
if (confirmed) { if (confirmed) {
@ -353,7 +355,9 @@ export abstract class ContentsStateBase extends State<Snapshot> {
} }
}), }),
map(results2 => { map(results2 => {
return [...results, ...results2]; const nonRetried = results.filter(x => !isReferrerError(x.error));
return [...nonRetried, ...results2];
}) })
); );
} else { } else {

Loading…
Cancel
Save