diff --git a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts index 03ec4e34a2ba34b7f6dfa7d4692d7d455051fed7..4243dcb846d845aee19c7e567081f68587b60fe8 100644 --- a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts +++ b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts @@ -98,7 +98,7 @@ export class IndexingModelsAdministrationComponent implements OnInit { filter((data: string) => data === 'ok'), exhaustMap(() => this.http.delete('../rest/indexingModels/' + indexingModel.id)), tap(() => { - for (let i in this.indexingModels) { + for (const i in this.indexingModels) { if (this.indexingModels[i].id === indexingModel.id) { this.indexingModels.splice(Number(i), 1); } @@ -109,7 +109,11 @@ export class IndexingModelsAdministrationComponent implements OnInit { this.notify.success(this.lang.indexingModelDeleted); }), catchError((err: any) => { - this.notify.handleErrors(err); + if (err.error.errors === 'Model is used by at least one resource') { + this.notify.error(this.lang.modelUsedByResources); + } else { + this.notify.handleSoftErrors(err); + } return of(false); }) ).subscribe(); diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 17250420e84b53368046257e3ee2068586f617f7..9a3171b38000fd9442d7af147e85cbb57086474d 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1666,4 +1666,5 @@ export const LANG_EN = { "sessionExpired": "Session expired", "accountSuspended": "Your user account has been suspended", "accountLocked": "Too many connections attemps. Retry in", + "modelUsedByResources": "This model is used by resources, you can't delete it.", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index eb124761d38bd6bea33356e19ee1faf637bb010c..0b6dc49e3d42ab18463292901ddc952b37bc41f2 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1666,4 +1666,5 @@ export const LANG_FR = { "sessionExpired": "Votre session a expirée", "accountSuspended": "Votre compte utilisateur a été suspendu", "accountLocked": "Nombre de tentatives de connexion dépassée. Réessayez dans", + "modelUsedByResources": "Le modèle est utilisé par des courriers, vous ne pouvez pas le supprimer.", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index fc3e24a407d799aa70d21e6c20f41a624013a09b..fb749e4d767543f6f703a2db5a76adc31ab46e21 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1653,4 +1653,5 @@ export const LANG_NL = { "sessionExpired": "Session expired", //_TO_TRANSLATE "accountSuspended": "Your user account has been suspended", //_TO_TRANSLATE "accountLocked": "Too many connections attemps. Retry in", //_TO_TRANSLATE + "modelUsedByResources": "This model is used by resources, you can't delete it.", //_TO_TRANSLATE };