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

Merge branch 'v15/dev' into v16/dev

Browse Source
This commit is contained in:
Niels Lyngsø
2025-03-17 11:09:30 +01:00
parent 0a7d0a8f8b e9ba06929f
commit 939552e9f1
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-manager.ts
View File

@@ -195,7 +195,7 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
}
const entry = { ...variantId.toObject(), alias, editorAlias, value } as UmbBlockDataValueModel<ValueType>;
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbBlockDataValueModel<ValueType>;
const currentData = this.getData();
if (currentData) {

2
src/Umbraco.Web.UI.Client/src/packages/core/content/workspace/content-detail-workspace-base.ts
View File

@@ -479,7 +479,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
}
// Notice the order of the properties is important for our JSON String Compare function. [NL]
const entry = { editorAlias, alias, ...variantId.toObject(), value } as UmbElementValueModel;
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbElementValueModel;
const currentData = this.getData();
if (currentData) {

2
src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/repository/detail/document-blueprint-detail.server.data-source.ts
View File

@@ -93,9 +93,9 @@ export class UmbDocumentBlueprintServerDataSource implements UmbDetailDataSource
values: data.values.map((value) => {
return {
editorAlias: value.editorAlias,
alias: value.alias,
culture: value.culture || null,
segment: value.segment || null,
alias: value.alias,
value: value.value,
};
}),

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document/input-document.context.ts
View File

@@ -46,7 +46,7 @@ export class UmbDocumentPickerInputContext extends UmbPickerInputContext<
...pickerData?.search?.queryParams,
};
super.openPicker(combinedPickerData);
await super.openPicker(combinedPickerData);
}
#pickableFilter = (

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/publishing/repository/document-publishing.server.data-source.ts
View File

@@ -137,9 +137,9 @@ export class UmbDocumentPublishingServerDataSource {
values: data.values.map((value) => {
return {
editorAlias: value.editorAlias,
alias: value.alias,
culture: value.culture || null,
segment: value.segment || null,
alias: value.alias,
value: value.value,
};
}),

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/repository/detail/document-detail.server.data-source.ts
View File

@@ -94,9 +94,9 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
values: data.values.map((value) => {
return {
editorAlias: value.editorAlias,
alias: value.alias,
culture: value.culture || null,
segment: value.segment || null,
alias: value.alias,
value: value.value,
};
}),

2
src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.context.ts
View File

@@ -44,7 +44,7 @@ export class UmbMediaPickerInputContext extends UmbPickerInputContext<
...pickerData?.search?.queryParams,
};
super.openPicker(combinedPickerData);
await super.openPicker(combinedPickerData);
}
#pickableFilter = (

2
src/Umbraco.Web.UI.Client/src/packages/members/member/components/input-member/input-member.context.ts
View File

@@ -48,7 +48,7 @@ export class UmbMemberPickerInputContext extends UmbPickerInputContext<
...pickerData?.search?.queryParams,
};
super.openPicker(combinedPickerData);
await super.openPicker(combinedPickerData);
}
#pickableFilter = (