Skip to content

Commit 2067db1

Browse files
authored
Content Workspace: not displaying varying composition values in a not varying context (Fixes #20707) (#20758)
* only vary if context varies * add controller aliases to these observations
1 parent 6f2b7ab commit 2067db1

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/Umbraco.Web.UI.Client/src/packages/content/content/workspace/content-detail-workspace-base.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,8 @@ export abstract class UmbContentDetailWorkspaceContextBase<
428428
const repo = new UmbDataTypeDetailRepository(this);
429429

430430
const propertyTypes = await this.structure.getContentTypeProperties();
431+
const contentTypeVariesByCulture = this.structure.getVariesByCulture();
432+
const contentTypeVariesBySegment = this.structure.getVariesByCulture();
431433
const valueDefinitions = await Promise.all(
432434
propertyTypes.map(async (property) => {
433435
// TODO: Implement caching for data-type requests. [NL]
@@ -446,8 +448,9 @@ export abstract class UmbContentDetailWorkspaceContextBase<
446448
propertyEditorSchemaAlias: dataType.editorAlias,
447449
config: dataType.values,
448450
typeArgs: {
449-
variesByCulture: property.variesByCulture,
450-
variesBySegment: property.variesBySegment,
451+
// Only vary if the content type varies:
452+
variesByCulture: contentTypeVariesByCulture ? property.variesByCulture : false,
453+
variesBySegment: contentTypeVariesBySegment ? property.variesBySegment : false,
451454
} as UmbPropertyTypePresetModelTypeModel,
452455
} as UmbPropertyTypePresetModel;
453456
}),

src/Umbraco.Web.UI.Client/src/packages/content/property-type/workspace/views/settings/property-workspace-view-settings.element.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,12 @@ export class UmbPropertyTypeWorkspaceViewSettingsElement extends UmbLitElement i
6666
this.observe(
6767
instance?.variesByCulture,
6868
(variesByCulture) => (this._contentTypeVariesByCulture = variesByCulture),
69+
'observeVariesByCulture',
6970
);
7071
this.observe(
7172
instance?.variesBySegment,
7273
(variesBySegment) => (this._contentTypeVariesBySegment = variesBySegment),
74+
'observeVariesBySegment',
7375
);
7476
this._entityType = instance?.getEntityType();
7577
}).passContextAliasMatches();

0 commit comments

Comments
 (0)