diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts index f54818f38c..caa326e926 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts @@ -428,6 +428,8 @@ export abstract class UmbContentDetailWorkspaceContextBase< const repo = new UmbDataTypeDetailRepository(this); const propertyTypes = await this.structure.getContentTypeProperties(); + const contentTypeVariesByCulture = this.structure.getVariesByCulture(); + const contentTypeVariesBySegment = this.structure.getVariesByCulture(); const valueDefinitions = await Promise.all( propertyTypes.map(async (property) => { // TODO: Implement caching for data-type requests. [NL] @@ -446,8 +448,9 @@ export abstract class UmbContentDetailWorkspaceContextBase< propertyEditorSchemaAlias: dataType.editorAlias, config: dataType.values, typeArgs: { - variesByCulture: property.variesByCulture, - variesBySegment: property.variesBySegment, + // Only vary if the content type varies: + variesByCulture: contentTypeVariesByCulture ? property.variesByCulture : false, + variesBySegment: contentTypeVariesBySegment ? property.variesBySegment : false, } as UmbPropertyTypePresetModelTypeModel, } as UmbPropertyTypePresetModel; }), diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts index b7bd794079..0720c5fcad 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts @@ -66,10 +66,12 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i this.observe( instance?.variesByCulture, (variesByCulture) => (this._contentTypeVariesByCulture = variesByCulture), + 'observeVariesByCulture', ); this.observe( instance?.variesBySegment, (variesBySegment) => (this._contentTypeVariesBySegment = variesBySegment), + 'observeVariesBySegment', ); this._entityType = instance?.getEntityType(); }).passContextAliasMatches();