yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/17.0'

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package.json
#	version.json
This commit is contained in:
Andy Butland
2025-11-13 10:48:51 +01:00
parent b65d2b0ec7 640f9f2615
commit 597eb58063
8 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.ts
View File

@@ -207,24 +207,22 @@ export class UmbContentTypeDesignEditorPropertiesElement extends UmbLitElement {
this._ownerContentTypeUnique = workspaceContext?.structure.getOwnerContentTypeUnique();
this.#createPropertyTypeWorkspaceRoutes();
const varyByCulturePromise =
this.observe(
workspaceContext?.variesByCulture,
(variesByCulture) => {
this._ownerContentTypeVariesByCulture = variesByCulture;
},
'observeOwnerVariesByCulture',
)?.asPromise() ?? Promise.reject();
const varyBySegmentPromise =
this.observe(
workspaceContext?.variesBySegment,
(variesBySegment) => {
this._ownerContentTypeVariesBySegment = variesBySegment;
},
'observeOwnerVariesBySegment',
)?.asPromise() ?? Promise.reject();
const varyByCulturePromise = this.observe(
workspaceContext?.variesByCulture,
(variesByCulture) => {
this._ownerContentTypeVariesByCulture = variesByCulture;
},
'observeOwnerVariesByCulture',
)?.asPromise();
const varyBySegmentPromise = this.observe(
workspaceContext?.variesBySegment,
(variesBySegment) => {
this._ownerContentTypeVariesBySegment = variesBySegment;
},
'observeOwnerVariesBySegment',
)?.asPromise();
if (this.#initResolver) {
if (varyByCulturePromise && varyBySegmentPromise && this.#initResolver) {
Promise.all([varyByCulturePromise, varyBySegmentPromise])
.then(() => {
this.#initResolver?.();