Skip to content

Commit e9ba069

Browse files
committed
Merge branch 'release/15.3' into v15/dev
# Conflicts: # version.json
2 parents a5da305 + 95fcf64 commit e9ba069

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export class UmbBlockElementManager<LayoutDataType extends UmbBlockLayoutBaseMod
195195
throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
196196
}
197197

198-
const entry = { ...variantId.toObject(), alias, editorAlias, value } as UmbBlockDataValueModel<ValueType>;
198+
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbBlockDataValueModel<ValueType>;
199199

200200
const currentData = this.getData();
201201
if (currentData) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ export abstract class UmbContentDetailWorkspaceContextBase<
479479
}
480480

481481
// Notice the order of the properties is important for our JSON String Compare function. [NL]
482-
const entry = { editorAlias, alias, ...variantId.toObject(), value } as UmbElementValueModel;
482+
const entry = { editorAlias, ...variantId.toObject(), alias, value } as UmbElementValueModel;
483483

484484
const currentData = this.getData();
485485
if (currentData) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ export class UmbDocumentBlueprintServerDataSource implements UmbDetailDataSource
9393
values: data.values.map((value) => {
9494
return {
9595
editorAlias: value.editorAlias,
96-
alias: value.alias,
9796
culture: value.culture || null,
9897
segment: value.segment || null,
98+
alias: value.alias,
9999
value: value.value,
100100
};
101101
}),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class UmbDocumentPickerInputContext extends UmbPickerInputContext<
4646
...pickerData?.search?.queryParams,
4747
};
4848

49-
super.openPicker(combinedPickerData);
49+
await super.openPicker(combinedPickerData);
5050
}
5151

5252
#pickableFilter = (

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ export class UmbDocumentPublishingServerDataSource {
137137
values: data.values.map((value) => {
138138
return {
139139
editorAlias: value.editorAlias,
140-
alias: value.alias,
141140
culture: value.culture || null,
142141
segment: value.segment || null,
142+
alias: value.alias,
143143
value: value.value,
144144
};
145145
}),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ export class UmbDocumentServerDataSource implements UmbDetailDataSource<UmbDocum
9494
values: data.values.map((value) => {
9595
return {
9696
editorAlias: value.editorAlias,
97-
alias: value.alias,
9897
culture: value.culture || null,
9998
segment: value.segment || null,
99+
alias: value.alias,
100100
value: value.value,
101101
};
102102
}),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export class UmbMediaPickerInputContext extends UmbPickerInputContext<
4444
...pickerData?.search?.queryParams,
4545
};
4646

47-
super.openPicker(combinedPickerData);
47+
await super.openPicker(combinedPickerData);
4848
}
4949

5050
#pickableFilter = (

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class UmbMemberPickerInputContext extends UmbPickerInputContext<
4848
...pickerData?.search?.queryParams,
4949
};
5050

51-
super.openPicker(combinedPickerData);
51+
await super.openPicker(combinedPickerData);
5252
}
5353

5454
#pickableFilter = (

0 commit comments

Comments
 (0)