diff --git a/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js index 517bdbcd46d24528bd0baa229a58ab2c9b5bb06e..a3f2c74b474d7ca9c14baf9b71dea982d01d5c87 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js +++ b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.js @@ -90,7 +90,7 @@ var ActionAdministrationComponent = /** @class */ (function () { _this.router.navigate(['/administration/actions']); _this.notify.success(_this.lang.actionAdded); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } else { @@ -99,7 +99,7 @@ var ActionAdministrationComponent = /** @class */ (function () { _this.router.navigate(['/administration/actions']); _this.notify.success(_this.lang.actionUpdated); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } }; diff --git a/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts index d18dec5f45809d4c0adaec9ffa20ab76e5bf76db..7cde5f2254b8484048bdc795b03cba63f413395b 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/action-administration.component.ts @@ -103,7 +103,7 @@ export class ActionAdministrationComponent implements OnInit { this.notify.success(this.lang.actionAdded); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } else { this.http.put(this.coreUrl + 'rest/actions/' + this.action.id, this.action) @@ -112,7 +112,7 @@ export class ActionAdministrationComponent implements OnInit { this.notify.success(this.lang.actionUpdated); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } } diff --git a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js index be370f7536b8489fe145f3a5cdd47261717fac3e..29dee42bcb708730a07c3fb8616fe74934a762c3 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js +++ b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.js @@ -76,7 +76,7 @@ var ActionsAdministrationComponent = /** @class */ (function () { _this.dataSource.sort = _this.sort; _this.notify.success(_this.lang.actionDeleted); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } }; diff --git a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts index 2a96f7c3d275216d87e979124f809e024dcb50bd..ce3b37da47f7e0384f127b753863f80e43adee4d 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/actions-administration.component.ts @@ -91,7 +91,7 @@ export class ActionsAdministrationComponent implements OnInit { this.notify.success(this.lang.actionDeleted); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } } diff --git a/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js index 4f6d5e172023c8fce25d583f2a22e9ed76d5afdf..17503e4ae72497a1f8eaf7cb510506f1aa1c9ccd 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js +++ b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js @@ -106,7 +106,7 @@ var StatusAdministrationComponent = /** @class */ (function () { } _this.statusImages = data['statusImages']; }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); }; StatusAdministrationComponent.prototype.submitStatus = function () { @@ -117,7 +117,7 @@ var StatusAdministrationComponent = /** @class */ (function () { _this.notify.success(_this.lang.statusAdded); _this.router.navigate(['administration/statuses']); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } else if (this.creationMode == false) { @@ -126,7 +126,7 @@ var StatusAdministrationComponent = /** @class */ (function () { _this.notify.success(_this.lang.statusUpdated); _this.router.navigate(['administration/statuses']); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } }; diff --git a/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts index bf1c663c545072b5c1ed5bd89b6f48357dd05234..29fe3ddc7e9cbde5a0fdb2607fc570117f89a4e9 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts @@ -112,7 +112,7 @@ export class StatusAdministrationComponent implements OnInit { } this.statusImages = data['statusImages']; }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } @@ -123,7 +123,7 @@ export class StatusAdministrationComponent implements OnInit { this.notify.success(this.lang.statusAdded); this.router.navigate(['administration/statuses']); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } else if (this.creationMode == false) { @@ -132,7 +132,7 @@ export class StatusAdministrationComponent implements OnInit { this.notify.success(this.lang.statusUpdated); this.router.navigate(['administration/statuses']); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } } diff --git a/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js index 4efebd316ed45fec05782e944746507158838c9a..c4cf591fe1f0654f28c9fd8bad48bbde2bf4b8fd 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js +++ b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js @@ -53,7 +53,7 @@ var StatusesAdministrationComponent = /** @class */ (function () { _this.dataSource.sort = _this.sort; }, 0); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); }; StatusesAdministrationComponent.prototype.prepareStatus = function () { @@ -72,7 +72,7 @@ var StatusesAdministrationComponent = /** @class */ (function () { _this.statuses = data.statuses; _this.notify.success(_this.lang.statusDeleted); }, function (err) { - _this.notify.error(JSON.parse(err._body).errors); + _this.notify.error(err.error.errors); }); } }; diff --git a/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts index df906144b11722b2e3e0a95cbdeaa0a8021f3c67..08194e0de470a430f9f50ab2878561afe0378d2c 100755 --- a/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts @@ -66,7 +66,7 @@ export class StatusesAdministrationComponent implements OnInit { }, 0); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } @@ -88,7 +88,7 @@ export class StatusesAdministrationComponent implements OnInit { this.notify.success(this.lang.statusDeleted); }, (err) => { - this.notify.error(JSON.parse(err._body).errors); + this.notify.error(err.error.errors); }); } } diff --git a/apps/maarch_entreprise/lang/fr.php b/apps/maarch_entreprise/lang/fr.php index 84a9651e79974e4b959b215c61f0e3752cd16ed7..3ebf524c3581699fa48261d0c5d74875f6d7c984 100755 --- a/apps/maarch_entreprise/lang/fr.php +++ b/apps/maarch_entreprise/lang/fr.php @@ -43,7 +43,7 @@ if (!defined("_ADMIN_USERS_DESC")) define("_ADMIN_USERS_DESC", "Ajouter, susp if (!defined("_ADMIN_DOCSERVERS_DESC")) define("_ADMIN_DOCSERVERS_DESC", "Ajouter, suspendre, ou modifier des zones de stockage. Placer les zones de stockages par type d'appartenance et définir leur groupe primaire."); if (!defined("_ADMIN_GROUPS")) define("_ADMIN_GROUPS", "Groupes d'utilisateurs"); if (!defined("_ADMIN_GROUPS_DESC")) define("_ADMIN_GROUPS_DESC", "Ajouter, suspendre, ou modifier des groupes d'utilisateurs. Attribuer des privilèges ou des autorisations d'accès aux ressources."); -if (!defined("_ADMIN_ARCHITECTURE")) define("_ADMIN_ARCHITECTURE", "Plan de classement"); +if (!defined("_ADMIN_ARCHITECTURE")) define("_ADMIN_ARCHITECTURE", "Typologie documentaire"); if (!defined("_ADMIN_ARCHITECTURE_DESC")) define("_ADMIN_ARCHITECTURE_DESC", "Définir la structure interne d'un dossier (chemise / sous-chemise / type de document). Définir pour chaque pièce la liste des index à saisir, et leur caractère obligatoire pour la complétude du dossier."); if (!defined("_VIEW_HISTORY")) define("_VIEW_HISTORY", "Historique"); if (!defined("_VIEW_HISTORY_BATCH")) define("_VIEW_HISTORY_BATCH", "Historique des batchs");