diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c624592a8..a6e4d2399f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ _**For better traceability add the corresponding GitHub issue number in each cha ## [UNRELEASED - DD.MM.YYYY] ### Changed -- #1122 fix editing notification sendTo attribute +- #1122 Fixed editing notification sendTo attribute +- #1328 Fixed semanticDataModel translation and part name within notification detail / edit view. ## [13.0.1 - 26.07.2024] diff --git a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts index 4991011a03..a7f962e0dd 100644 --- a/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts +++ b/frontend/src/app/modules/page/notifications/detail/notification-detail.component.ts @@ -195,8 +195,8 @@ export class NotificationDetailComponent implements AfterViewInit, OnDestroy { private setTableConfigs(data: Notification): void { this.isReceived = !data.isFromSender; - const displayedColumns = [ 'id', 'semanticDataModel', 'name', 'semanticModelId' ]; - const sortableColumns = { id: true, semanticDataModel: true, name: true, semanticModelId: true }; + const displayedColumns = [ 'id', 'semanticDataModel', 'nameAtManufacturer', 'semanticModelId' ]; + const sortableColumns = { id: true, semanticDataModel: true, nameAtManufacturer: true, semanticModelId: true }; const tableConfig = { displayedColumns, diff --git a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html index 0483046d65..ddcf09a863 100644 --- a/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html +++ b/frontend/src/app/modules/shared/components/parts-table/parts-table.component.html @@ -325,7 +325,7 @@

{{ 'table.noResultFound' | i18n }}

- {{'table.semanticDataModel.' + element[column] | i18n}} + {{'table.semanticDataModel.' + element[column]?.toUpperCase() | i18n}}