diff --git a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html index 939c5d560f900edcc82494c291d3cc981bba3bcd..595803b18bee6c38ec1ab5f23f31667a9cfcbfc9 100644 --- a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html +++ b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.html @@ -14,7 +14,7 @@ mat-sort-header>{{ "document.events.panel.label.date" | translate }} </th> <td mat-cell *matCellDef="let row;"> - {{ row.eventOn | date: getDateTimeFormat }} + {{ row.eventOn | date: dateTimeFormat }} </td> </ng-container> <ng-container matColumnDef="eventType"> diff --git a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts index c570f4cd8585eaf1158fd1c438797305f273d025..c22cc2a6298b302fc024799744238fe8e47348ee 100644 --- a/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts +++ b/smp-angular/src/app/common/panels/document-events-panel/document-events-panel.component.ts @@ -76,7 +76,7 @@ export class DocumentEventsPanelComponent implements AfterViewInit, BeforeLeaveG private controlContainer: ControlContainer) { } - get getDateTimeFormat(): string { + get dateTimeFormat(): string { return this.globalLookups.getDateTimeFormat(); } diff --git a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html index 97f76b59a3f7a61d103958bd964de6a20e476f2b..7c0778d306e134a2c34eb174e74d782a50d36f6c 100644 --- a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html +++ b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.html @@ -26,7 +26,7 @@ mat-sort-header>{{ "document.versions.panel.label.created" | translate }} </th> <td mat-cell *matCellDef="let row;"> - {{ row.createdOn | date: getDateTimeFormat }} + {{ row.createdOn | date: dateTimeFormat }} </ng-container> <ng-container matColumnDef="lastUpdatedOn"> @@ -34,7 +34,7 @@ mat-sort-header>{{ "document.versions.panel.label.updated" | translate }} </th> <td mat-cell *matCellDef="let row;"> - {{ row.lastUpdatedOn | date: getDateTimeFormat }} + {{ row.lastUpdatedOn | date: dateTimeFormat }} </ng-container> <tr mat-header-row diff --git a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts index 38b6161f78ab3a6cc5b1592c5b41de9d05f5038e..0583a8bfa1a93c0b73145e6a8eefa5ae2a9a69c4 100644 --- a/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts +++ b/smp-angular/src/app/common/panels/document-versions-panel/document-versions-panel.component.ts @@ -76,7 +76,7 @@ export class DocumentVersionsPanelComponent implements AfterViewInit, BeforeLeav private controlContainer: ControlContainer) { } - get getDateTimeFormat(): string { + get dateTimeFormat(): string { return this.globalLookups.getDateTimeFormat(); } diff --git a/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html b/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html index f4e33f08f8b3ceb91e0e2271dd069fcd1b87cfc2..3a730ea3b55c8a283a53218a94560526bd4277f1 100644 --- a/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html +++ b/smp-angular/src/app/common/panels/review-tasks-panel/review-tasks-panel.component.html @@ -17,13 +17,4 @@ <ng-template #dateTimeColumn let-value="value" ngx-datatable-cell-template> <div class='truncate-text' title="{{value | date:dateTimeFormat}}">{{ value | date:dateTimeFormat }}</div> </ng-template> - <ng-template #truncateText let-value="value" ngx-datatable-cell-template> - <div class='truncate-text' title="{{value}}">{{ value }}</div> - </ng-template> - <ng-template #forUser let-row="row" let-value="value" ngx-datatable-cell-template> - <div class='truncate-text' title="{{ 'alert.panel.user.title' | translate: {value, mailTo: row.mailTo} }}">{{ value }}</div> - </ng-template> - <ng-template #credentialType let-row="row" let-value="value" ngx-datatable-cell-template> - <div class='truncate-text'>{{ value['CREDENTIAL_TYPE'] }}</div> - </ng-template> </smp-search-table> diff --git a/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts b/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts index 258a794753183738104b4226554eea2e098ebaf7..8352877c0c47d44e6d2e995063328891409ef41a 100644 --- a/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts +++ b/smp-angular/src/app/edit/edit-resources/resource-details-panel/resource-details-panel.component.ts @@ -154,13 +154,16 @@ export class ResourceDetailsPanelComponent implements BeforeLeaveGuard { let updatedResource: ResourceRo = this.resource; this.editResourceService.updateResourceForGroup(updatedResource, this.group, this.domain).subscribe({ next: (result: ResourceRo): void => { - if (!!result) { - this.alertService.successForTranslation("resource.details.panel.alert.resource.saved"); - this.editResourceController.selectedResource = result; - this._resource = result; - this.resourceForm.markAsPristine(); + try { + if (!!result) { + this.alertService.successForTranslation("resource.details.panel.alert.resource.saved"); + this.editResourceController.selectedResource = result; + this._resource = result; + this.resourceForm.markAsPristine(); + } + } finally { + this.windowSpinnerService.showSpinner = false; } - this.windowSpinnerService.showSpinner = false; }, error: (err: any): void => { this.alertService.error(err.error?.errorDescription) this.windowSpinnerService.showSpinner = false;