From e891640fda5bbe66dd02000b4c9800e9060ed3d2 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 19 Feb 2018 17:32:06 +0100
Subject: [PATCH] FEAT #109 Lang for update status
---
.../administration/update-status-administration.component.js | 1 -
.../administration/update-status-administration.component.ts | 1 -
.../js/angular/plugins/autocomplete.plugin.js | 1 -
.../js/angular/plugins/autocomplete.plugin.ts | 1 -
src/app/resource/controllers/ResController.php | 4 ++--
src/core/lang/lang-en.php | 2 ++
src/core/lang/lang-fr.php | 2 ++
7 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.js b/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.js
index 53ae5081e29..c456257479c 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.js
+++ b/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.js
@@ -68,7 +68,6 @@ var UpdateStatusAdministrationComponent = /** @class */ (function (_super) {
else if (this.chrono != "") {
body["chrono"] = this.chrono;
}
- console.log(body);
this.http.put(this.coreUrl + "rest/res/resource/status", body)
.subscribe(function () {
_this.resId = "";
diff --git a/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.ts
index c34c482efa5..e921c14769d 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/update-status-administration.component.ts
@@ -67,7 +67,6 @@ export class UpdateStatusAdministrationComponent extends AutoCompletePlugin impl
} else if (this.chrono != "") {
body["chrono"] = this.chrono;
}
- console.log(body);
this.http.put(this.coreUrl + "rest/res/resource/status", body)
.subscribe(() => {
this.resId = "";
diff --git a/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.js b/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.js
index 97c9d12f88d..0dc4a69ecc2 100644
--- a/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.js
+++ b/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.js
@@ -28,7 +28,6 @@ var AutoCompletePlugin = /** @class */ (function () {
_this.statusesList = data['statuses'];
_this.filteredStatuses = _this.statusCtrl.valueChanges
.pipe(startWith_1.startWith(''), map_1.map(function (status) { return status ? _this.autocompleteFilterStatuses(status) : _this.statusesList.slice(); }));
- console.log(_this.statusesList);
}, function () {
location.href = "index.php";
});
diff --git a/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.ts b/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.ts
index 509a15401a8..08864640a3b 100644
--- a/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.ts
+++ b/apps/maarch_entreprise/js/angular/plugins/autocomplete.plugin.ts
@@ -42,7 +42,6 @@ export class AutoCompletePlugin {
startWith(''),
map(status => status ? this.autocompleteFilterStatuses(status) : this.statusesList.slice())
);
- console.log(this.statusesList);
}, () => {
location.href = "index.php";
});
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index b3728b79c28..5be0cefaabd 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -116,7 +116,7 @@ class ResController
$data['status'] = 'COU';
}
if (empty(StatusModel::getById(['id' => $data['status']]))) {
- return $response->withStatus(400)->withJson(['errors' => 'Status not found']);
+ return $response->withStatus(400)->withJson(['errors' => _STATUS_NOT_FOUND]);
}
if (empty($data['historyMessage'])) {
$data['historyMessage'] = _UPDATE_STATUS;
@@ -135,7 +135,7 @@ class ResController
$document = ResModel::getById(['resId' => $data['resId'], 'select' => ['res_id']]);
}
if (empty($document)) {
- return $response->withStatus(400)->withJson(['errors' => 'Document not found']);
+ return $response->withStatus(400)->withJson(['errors' => _DOCUMENT_NOT_FOUND]);
}
if (!ResController::hasRightByResId(['resId' => $document['res_id'], 'userId' => $GLOBALS['userId']])) {
return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php
index 65f7f213668..5ffa92bb6ba 100644
--- a/src/core/lang/lang-en.php
+++ b/src/core/lang/lang-en.php
@@ -31,6 +31,7 @@ define('_DOCTYPE_FIRSTLEVEL_UPDATED', 'Doctype first level edited');
define('_DOCTYPE_SECONDLEVEL_ADDED', 'Doctype second level added');
define('_DOCTYPE_SECONDLEVEL_DELETED', 'Doctype second level deleted');
define('_DOCTYPE_SECONDLEVEL_UPDATED', 'Doctype second level edited');
+define('_DOCUMENT_NOT_FOUND', 'Document not found');
define('_ENTITY_CREATION', 'Entity creation');
define('_ENTITY_MODIFICATION', 'Entity modification');
define('_ENTITY_SUPPRESSION', 'Entity suppression');
@@ -51,6 +52,7 @@ define('_PRIORITY_SUPPRESSION', 'Priority suppression');
define('_REPORT_MODIFICATION', 'Report modification');
define('_STATUS_ADDED', 'Statut added');
define('_STATUS_DELETED', 'Statut deleted');
+define('_STATUS_NOT_FOUND', 'Status not found');
define('_USER_GROUP_CREATION', 'Group added for user');
define('_USER_GROUP_MODIFICATION', 'Group updated for user');
define('_USER_GROUP_SUPPRESSION', 'Group deleted for user');
diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php
index 42368448a74..b22cb1fcf06 100644
--- a/src/core/lang/lang-fr.php
+++ b/src/core/lang/lang-fr.php
@@ -31,6 +31,7 @@ define('_DOCTYPE_FIRSTLEVEL_UPDATED', 'Chemise modifiée');
define('_DOCTYPE_SECONDLEVEL_ADDED', 'Sous-chemise ajoutée');
define('_DOCTYPE_SECONDLEVEL_DELETED', 'Sous-chemise supprimée');
define('_DOCTYPE_SECONDLEVEL_UPDATED', 'Sous-chemise modifiée');
+define('_DOCUMENT_NOT_FOUND', 'Document introuvable');
define('_ENTITY_CREATION', 'Création entité');
define('_ENTITY_MODIFICATION', 'Modification entité');
define('_ENTITY_SUPPRESSION', 'Suppression entité');
@@ -51,6 +52,7 @@ define('_PRIORITY_SUPPRESSION', 'Suppression priorité');
define('_REPORT_MODIFICATION', 'Modification états et édition');
define('_STATUS_ADDED', 'Statut ajouté');
define('_STATUS_DELETED', 'Statut supprimé');
+define('_STATUS_NOT_FOUND', 'Statut introuvable');
define('_USER_GROUP_CREATION', 'Groupe ajouté pour utilisateur');
define('_USER_GROUP_MODIFICATION', 'Groupe modifié pour utilisateur');
define('_USER_GROUP_SUPPRESSION', 'Groupe supprimé pour utilisateur');
\ No newline at end of file
--
GitLab