diff --git a/src/app/indexingModel/controllers/IndexingModelController.php b/src/app/indexingModel/controllers/IndexingModelController.php index c522bfa552ebde5ad0936a843c58b82510ce1ee7..3f493ef22d4dd878edce61047e9ed53443fb83eb 100755 --- a/src/app/indexingModel/controllers/IndexingModelController.php +++ b/src/app/indexingModel/controllers/IndexingModelController.php @@ -396,7 +396,7 @@ class IndexingModelController ]); if (!empty($resources)) { - return $response->withStatus(400)->withJson(['errors' => 'Model is used by at least one resource']); + return $response->withStatus(400)->withJson(['errors' => 'Model is used by at least one resource', 'lang' => 'modelUsedByResources']); } $childrenModels = IndexingModelModel::get(['select' => ['id', 'label'], 'where' => ['"master" = ?'], 'data' => [$args['id']]]); 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 4243dcb846d845aee19c7e567081f68587b60fe8..cf6ef892477a31827df4a9b0981b4c04b601eb3a 100644 --- a/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts +++ b/src/frontend/app/administration/indexingModel/indexing-models-administration.component.ts @@ -109,11 +109,7 @@ export class IndexingModelsAdministrationComponent implements OnInit { this.notify.success(this.lang.indexingModelDeleted); }), catchError((err: any) => { - if (err.error.errors === 'Model is used by at least one resource') { - this.notify.error(this.lang.modelUsedByResources); - } else { - this.notify.handleSoftErrors(err); - } + this.notify.handleSoftErrors(err); return of(false); }) ).subscribe(); diff --git a/src/frontend/app/administration/template/template-administration.component.ts b/src/frontend/app/administration/template/template-administration.component.ts index c6b67de41dc999d04de752b14b2cc7c545b97aef..e60df48ac7e47f4dfb72e46840f21a48f0b6602e 100755 --- a/src/frontend/app/administration/template/template-administration.component.ts +++ b/src/frontend/app/administration/template/template-administration.component.ts @@ -386,7 +386,7 @@ export class TemplateAdministrationComponent implements OnInit, OnDestroy { } } if (this.functionsService.empty(editorOptions.objectId)) { - alert('Vous ne pouvez pas éditer avec l\'applet Java un document importé.'); + alert(this.lang.canNotEditImportedDocumentWhenJava); return false; } } else { diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 3841a5f0673c7498f7cec34f7a93160e4a868802..18e877ca1358073c34c2a6f81e7a9ec28cd99d4c 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -538,6 +538,7 @@ export const LANG_EN = { "doctype": "Document type", "doctypes": "Document types", "documentEditor": "Document editor", + "canNotEditImportedDocumentWhenJava": "You can not edit imported document with Java applet", "documentEditor_java": "Open your default document editor in a new window", "documentEditor_onlyoffice": "Open OnlyOffice directly inside Maarch Courrier", "documentOutOfPerimeter": "This document is out of your perimeter", diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index a241748ab0d6eb571a2dd9fa76e71ec0a14d5172..44511215d4deed6b79423bc5ba7ca23b1407ea83 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -538,6 +538,7 @@ export const LANG_FR = { "doctype": "Type de courrier", "doctypes": "Types de courriers", "documentEditor": "Editeur de document", + "canNotEditImportedDocumentWhenJava": "Vous ne pouvez pas éditer un document importé avec l'applet Java", "documentEditor_java": "Ouvre votre éditeur de document par défaut dans une nouvelle fenêtre", "documentEditor_onlyoffice": "Ouvre la suite OnlyOffice directement dans l'application Maarch Courrier", "documentOutOfPerimeter": "Ce document est en dehors de votre périmètre", diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 13c9289d4791830c85abe10ffab3a8837f317f5e..9e9e07084533331af152470ce41e5676aff193cf 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1378,6 +1378,7 @@ export const LANG_NL = { "editorOption": "Editor option", //_TO_TRANSLATE "editorOptionAdmin": "Manage editor option", //_TO_TRANSLATE "documentEditor": "Document editor", //_TO_TRANSLATE + "canNotEditImportedDocumentWhenJava": "You can not edit imported document with Java applet", //translate "documentEditor_java": "Open your defaut document editor in a new windows", //_TO_TRANSLATE "documentEditor_onlyoffice": "Open OnlyOffice inside Maarch Courrier application", //_TO_TRANSLATE "contactsList": "Contacts list", //_TO_TRANSLATE