From e86d8a58c97172b0927a332f353b7a15976b026a Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Wed, 9 Oct 2019 16:28:54 +0200
Subject: [PATCH] Fix after code review
---
src/app/entity/controllers/ListInstanceController.php | 2 +-
.../indexingModel/controllers/IndexingModelController.php | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/app/entity/controllers/ListInstanceController.php b/src/app/entity/controllers/ListInstanceController.php
index 32f48781d90..d0fbd26a477 100755
--- a/src/app/entity/controllers/ListInstanceController.php
+++ b/src/app/entity/controllers/ListInstanceController.php
@@ -158,7 +158,7 @@ class ListInstanceController
$user = UserModel::getByLogin(['login' => $instance['item_id']]);
if (empty($user)) {
DatabaseModel::rollbackTransaction();
- return ['errors' => 'User not found', 'code' => 404];
+ return ['errors' => 'User not found', 'code' => 400];
}
} elseif ($instance['item_type'] == 'entity_id') {
$entity = EntityModel::getByEntityId(['entityId' => $instance['item_id']]);
diff --git a/src/app/indexingModel/controllers/IndexingModelController.php b/src/app/indexingModel/controllers/IndexingModelController.php
index 57e03e35db1..7fd31243a34 100644
--- a/src/app/indexingModel/controllers/IndexingModelController.php
+++ b/src/app/indexingModel/controllers/IndexingModelController.php
@@ -330,7 +330,7 @@ class IndexingModelController
}
$resources = ResModel::get([
- 'select' => ['model_id'],
+ 'select' => ['1'],
'where' => ['model_id = ?'],
'data' => [$args['id']]
]);
@@ -375,7 +375,8 @@ class IndexingModelController
return $response->withStatus(204);
}
- public function disable(Request $request, Response $response, array $args) {
+ public function disable(Request $request, Response $response, array $args)
+ {
if (!ServiceModel::hasService(['id' => 'admin_indexing_models', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
@@ -400,7 +401,8 @@ class IndexingModelController
return $response->withStatus(204);
}
- public function enable(Request $request, Response $response, array $args) {
+ public function enable(Request $request, Response $response, array $args)
+ {
if (!ServiceModel::hasService(['id' => 'admin_indexing_models', 'userId' => $GLOBALS['userId'], 'location' => 'apps', 'type' => 'admin'])) {
return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']);
}
--
GitLab