Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-2460: Fixed delete template error msg

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-14 11:56:24 +03:00
parent ebb0676918
commit fd949af1fc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/red-ui/src/app/modules/admin/components/dossier-template-actions/dossier-template-actions.component.ts
View File

@ -50,6 +50,12 @@ export class DossierTemplateActionsComponent implements OnInit {
await this._dossierTemplatesService
.delete([this.dossierTemplateId])
.toPromise()
.then(async () => {
await this._dossierTemplatesService.loadAll().toPromise();
await this._appStateService.loadDictionaryData();
this.loadDossierTemplatesData.emit();
await this._router.navigate(['main', 'admin']);
})
.catch(error => {
if (error.status === 409) {
this._toaster.error(_('dossier-templates-listing.error.conflict'));
@ -58,11 +64,7 @@ export class DossierTemplateActionsComponent implements OnInit {
}
this._loadingService.stop();
});
await this._dossierTemplatesService.loadAll().toPromise();
await this._appStateService.loadDictionaryData();
await this._router.navigate(['main', 'admin']);
this._loadingService.stop();
this.loadDossierTemplatesData.emit();
});
}
}

4
apps/red-ui/src/app/modules/dossier/screens/dossier-overview/screen/dossier-overview-screen.component.ts
View File

@ -113,8 +113,8 @@ export class DossierOverviewScreenComponent extends ListingComponent<File> imple
private _fileAttributeConfigs: IFileAttributeConfig[];
set fileAttributeConfigs(value: IFileAttributeConfig[]) {
this._fileAttributeConfigs = value;
this.displayedInFileListAttributes = value.filter(config => config.displayedInFileList);
this._fileAttributeConfigs = value || [];
this.displayedInFileListAttributes = this._fileAttributeConfigs.filter(config => config.displayedInFileList);
this.displayedAttributes = this.displayedInFileListAttributes.filter(c => c.displayedInFileList);
}