diff --git a/backend/i18n/frontend_en.json b/backend/i18n/frontend_en.json index ba02bb434..24b4636a3 100644 --- a/backend/i18n/frontend_en.json +++ b/backend/i18n/frontend_en.json @@ -355,6 +355,7 @@ "contents.loadDataFailed": "Failed to load data. Please reload.", "contents.loadFailed": "Failed to load contents. Please reload.", "contents.loadVersionFailed": "Failed to version a new version. Please reload.", + "contents.newStatusFieldDescription": "The new status of the content item.", "contents.noReference": "- No Reference -", "contents.pendingChangesTextToChange": "You have unsaved changes.\n\nWhen you change the status you will loose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTextToClose": "You have unsaved changes.\n\nWhen you close the current content view you will loose them.\n\n**Do you want to continue anyway?**", diff --git a/backend/i18n/frontend_nl.json b/backend/i18n/frontend_nl.json index 424445254..5ffd942c2 100644 --- a/backend/i18n/frontend_nl.json +++ b/backend/i18n/frontend_nl.json @@ -355,6 +355,7 @@ "contents.loadDataFailed": "Laden van gegevens is mislukt. Laad opnieuw.", "contents.loadFailed": "Laden van inhoud is mislukt. Laad opnieuw.", "contents.loadVersionFailed": "Versie van een nieuwe versie is mislukt. Laad opnieuw.", + "contents.newStatusFieldDescription": "The new status of the content item.", "contents.noReference": "- Geen referentie -", "contents.pendingChangesTextToChange": "Je hebt niet-opgeslagen wijzigingen. \n \n Wanneer je de status wijzigt, raak je ze kwijt. \n \n **Wil je toch doorgaan?**", "contents.pendingChangesTextToClose": "Je hebt niet-opgeslagen wijzigingen. \n \n Wanneer je de huidige inhoudsweergave sluit, raak je ze kwijt. \n n **Wil je toch doorgaan?**", diff --git a/backend/i18n/source/frontend_en.json b/backend/i18n/source/frontend_en.json index ba02bb434..24b4636a3 100644 --- a/backend/i18n/source/frontend_en.json +++ b/backend/i18n/source/frontend_en.json @@ -355,6 +355,7 @@ "contents.loadDataFailed": "Failed to load data. Please reload.", "contents.loadFailed": "Failed to load contents. Please reload.", "contents.loadVersionFailed": "Failed to version a new version. Please reload.", + "contents.newStatusFieldDescription": "The new status of the content item.", "contents.noReference": "- No Reference -", "contents.pendingChangesTextToChange": "You have unsaved changes.\n\nWhen you change the status you will loose them.\n\n**Do you want to continue anyway?**", "contents.pendingChangesTextToClose": "You have unsaved changes.\n\nWhen you close the current content view you will loose them.\n\n**Do you want to continue anyway?**", diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/ContentSchemaBuilder.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/ContentSchemaBuilder.cs index 0acd3b306..2d86dad5e 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/ContentSchemaBuilder.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/ContentSchemaBuilder.cs @@ -32,6 +32,7 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema ["createdBy"] = SchemaBuilder.StringProperty($"The user that has created the {schemaName} content.", true), ["lastModified"] = SchemaBuilder.DateTimeProperty($"The date and time when the {schemaName} content has been modified last.", true), ["lastModifiedBy"] = SchemaBuilder.StringProperty($"The user that has updated the {schemaName} content last.", true), + ["newStatus"] = SchemaBuilder.StringProperty($"The new status of the content.", true), ["status"] = SchemaBuilder.StringProperty($"The status of the content.", true) }, Type = JsonObjectType.Object diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs index 1aaa73798..7ef86ba06 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs @@ -203,6 +203,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries entityType.AddStructuralProperty(nameof(IContentEntity.CreatedBy).ToCamelCase(), EdmPrimitiveTypeKind.String); entityType.AddStructuralProperty(nameof(IContentEntity.LastModified).ToCamelCase(), EdmPrimitiveTypeKind.DateTimeOffset); entityType.AddStructuralProperty(nameof(IContentEntity.LastModifiedBy).ToCamelCase(), EdmPrimitiveTypeKind.String); + entityType.AddStructuralProperty(nameof(IContentEntity.NewStatus).ToCamelCase(), EdmPrimitiveTypeKind.String); entityType.AddStructuralProperty(nameof(IContentEntity.Status).ToCamelCase(), EdmPrimitiveTypeKind.String); entityType.AddStructuralProperty(nameof(IContentEntity.Version).ToCamelCase(), EdmPrimitiveTypeKind.Int32); entityType.AddStructuralProperty(nameof(IContentEntity.Data).ToCamelCase(), new EdmComplexTypeReference(schemaType, false)); diff --git a/frontend/app/shared/components/search/search-form.component.scss b/frontend/app/shared/components/search/search-form.component.scss index e6f35bf63..30dcf2f4e 100644 --- a/frontend/app/shared/components/search/search-form.component.scss +++ b/frontend/app/shared/components/search/search-form.component.scss @@ -34,6 +34,14 @@ padding: 0 .5rem; } + &:focus { + text-decoration: none; + } + + &:hover { + text-decoration: none; + } + &.highlighted { color: $color-title !important; } diff --git a/frontend/app/shared/state/query.ts b/frontend/app/shared/state/query.ts index 465594b08..6f253c80e 100644 --- a/frontend/app/shared/state/query.ts +++ b/frontend/app/shared/state/query.ts @@ -294,6 +294,13 @@ export function queryModelFromSchema(schema: SchemaDetailsDto, languages: Readon description: 'i18n:contents.statusFieldDescription', extra: statuses }; + + model.fields['newStatus'] = { + ...TypeStatus, + displayName: MetaFields.statusNext, + description: 'i18n:contents.newStatusFieldDescription', + extra: statuses + }; } for (const field of schema.fields) {