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

Merge branch 'bugfix/keep-entity-action-dialog-open' into feature/remove-parent-from-detail-model

Browse Source
This commit is contained in:
Mads Rasmussen
2024-03-02 21:22:59 +01:00
parent 0a7a72779c b4faae9af4
commit eba59fded7
8 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts
View File

@@ -8,7 +8,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTy
if (!this.repository) throw new Error('Repository is not available');
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_DATA_TYPE_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_DATA_TYPE_CREATE_OPTIONS_MODAL, {
data: {
parent: {
entityType: this.entityType,
@@ -16,5 +16,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDataTy
},
},
});
await modalContext.onSubmit();
}
}

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts
View File

@@ -8,7 +8,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocume
if (!this.repository) throw new Error('Repository is not available');
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, {
data: {
parent: {
unique: this.unique,
@@ -16,5 +16,7 @@ export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase<UmbDocume
},
},
});
await modalContext.onSubmit();
}
}

2
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
View File

@@ -36,7 +36,7 @@ export class UmbDataTypeCreateOptionsModalElement extends UmbModalBaseElement<Um
// close the modal when navigating to data type
#onNavigate() {
this._rejectModal();
this._submitModal();
}
#getCreateHref() {

4
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts
View File

@@ -28,11 +28,13 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase<UmbDocume
}
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_DOCUMENT_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_DOCUMENT_CREATE_OPTIONS_MODAL, {
data: {
document: documentItem ? { unique: documentItem.unique } : null,
documentType: documentItem ? { unique: documentItem.documentType.unique } : null,
},
});
await modalContext.onSubmit();
}
}

4
src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts
View File

@@ -8,7 +8,7 @@ export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase<UmbMedia
if (!this.repository) throw new Error('Repository is not available');
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL, {
data: {
parent: {
unique: this.unique,
@@ -16,5 +16,7 @@ export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase<UmbMedia
},
},
});
await modalContext.onSubmit();
}
}

4
src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts
View File

@@ -38,8 +38,10 @@ export class UmbCreateMediaEntityAction extends UmbEntityActionBase<UmbMediaDeta
private async _openModal(modalData: UmbMediaCreateOptionsModalData) {
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_MEDIA_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_MEDIA_CREATE_OPTIONS_MODAL, {
data: modalData,
});
await modalContext.onSubmit();
}
}

4
src/Umbraco.Web.UI.Client/src/packages/templating/scripts/entity-actions/create/create.action.ts
View File

@@ -7,7 +7,7 @@ export class UmbScriptCreateOptionsEntityAction extends UmbEntityActionBase<neve
if (!this.repository) throw new Error('Repository is not available');
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_SCRIPT_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_SCRIPT_CREATE_OPTIONS_MODAL, {
data: {
parent: {
entityType: this.entityType,
@@ -15,5 +15,7 @@ export class UmbScriptCreateOptionsEntityAction extends UmbEntityActionBase<neve
},
},
});
await modalContext.onSubmit();
}
}

4
src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/entity-actions/create/create.action.ts
View File

@@ -7,7 +7,7 @@ export class UmbStylesheetCreateOptionsEntityAction extends UmbEntityActionBase<
if (!this.repository) throw new Error('Repository is not available');
const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
modalManager.open(this, UMB_STYLESHEET_CREATE_OPTIONS_MODAL, {
const modalContext = modalManager.open(this, UMB_STYLESHEET_CREATE_OPTIONS_MODAL, {
data: {
parent: {
unique: this.unique,
@@ -15,5 +15,7 @@ export class UmbStylesheetCreateOptionsEntityAction extends UmbEntityActionBase<
},
},
});
await modalContext.onSubmit();
}
}