From 64255530520505f605c8e8841a1be52011f73db5 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 15 Apr 2020 14:38:24 +0200
Subject: [PATCH] FEAT #13721 TIME 0:10 fix err msg
---
.../indexing-models-administration.component.ts | 8 ++++++--
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
4 files changed, 9 insertions(+), 2 deletions(-)
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 03ec4e34a2b..4243dcb846d 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 17250420e84..9a3171b3800 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 eb124761d38..0b6dc49e3d4 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 fc3e24a407d..fb749e4d767 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
};
--
GitLab