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

small fixes

Browse Source
This commit is contained in:
JesmoDev
2024-04-10 13:44:42 +02:00
parent acab0115a5
commit 9a436f3d8d
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/assets/lang/da-dk.ts
View File

@@ -834,6 +834,7 @@ export default {
submit: 'Indsend',
type: 'Type',
typeToSearch: 'Skriv for at søge...',
unknownUser: 'Ukendt bruger',
under: 'under',
up: 'Op',
update: 'Opdatér',

1
src/Umbraco.Web.UI.Client/src/assets/lang/en-us.ts
View File

@@ -842,6 +842,7 @@ export default {
type: 'Type',
typeName: 'Type Name',
typeToSearch: 'Type to search...',
unknownUser: 'Unknown user',
under: 'under',
up: 'Up',
update: 'Update',

19
src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/rollback/rollback-modal.element.ts
View File

@@ -98,7 +98,8 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
data?.items.forEach((item: any) => {
tempItems.push({
date: item.versionDate,
user: userItems?.find((user) => user.unique === item.user.id)?.name || 'Unknown user',
user:
userItems?.find((user) => user.unique === item.user.id)?.name || this.localize.term('general_unknownUser'),
isCurrentlyPublishedVersion: item.isCurrentPublishedVersion,
id: item.id,
preventCleanup: item.preventCleanup,
@@ -286,12 +287,16 @@ export class UmbRollbackModalElement extends UmbModalBaseElement<UmbRollbackModa
<uui-box headline=${this.currentVersionHeader} id="box-right"> ${this.#renderCurrentVersion()} </uui-box>
</div>
<umb-footer-layout slot="footer">
<uui-button slot="actions" look="secondary" @click=${this.#onCancel}
>${this.localize.term('general_cancel')}</uui-button
>
<uui-button slot="actions" look="primary" @click=${this.#onRollback}
>${this.localize.term('general_cancel')}</uui-button
>
<uui-button
slot="actions"
look="secondary"
@click=${this.#onCancel}
label=${this.localize.term('general_cancel')}></uui-button>
<uui-button
slot="actions"
look="primary"
@click=${this.#onRollback}
label=${this.localize.term('actions_rollback')}></uui-button>
</umb-footer-layout>
</umb-body-layout>
`;

11
src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/info/document-workspace-view-info-history.element.ts
View File

@@ -17,6 +17,7 @@ import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import type { AuditLogWithUsernameResponseModel } from '@umbraco-cms/backoffice/external/backend-api';
import { DirectionModel } from '@umbraco-cms/backoffice/external/backend-api';
import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
@customElement('umb-document-workspace-view-info-history')
export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
@@ -94,11 +95,10 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
const modalManagerContext = await this.getContext(UMB_MODAL_MANAGER_CONTEXT);
const modalContext = modalManagerContext.open(this, UMB_ROLLBACK_MODAL, {});
if (!modalContext) return;
modalContext.onSubmit().then(() => {
console.log('Rollback modal submitted');
});
await modalContext.onSubmit();
// TODO: This notification won't actually show at the moment because we perform a full page reload after rollback. However, when we can do it without a full page reload, this should be used.
const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
notificationContext.peek('positive', { data: { message: this.localize.term('rollback_documentRolledBack') } });
};
render() {
@@ -111,7 +111,6 @@ export class UmbDocumentWorkspaceViewInfoHistoryElement extends UmbLitElement {
slot="actions"
@click=${this.#onRollbackModalOpen}>
<uui-icon name="icon-undo"></uui-icon>
<umb-localize key="actions_rollback"></umb-localize>
</uui-button>
</div>
${this._items ? this.#renderHistory() : html`<uui-loader-circle></uui-loader-circle> `}