diff --git a/rest/index.php b/rest/index.php index 50d89efec8246ba9d55716b0451457d2a99a5c79..2a70da8a1019f9a6b0e79c1c0c33320baa7c0b2e 100755 --- a/rest/index.php +++ b/rest/index.php @@ -219,7 +219,7 @@ $app->put('/groups/{id}/indexing', \Group\controllers\GroupController::class . ' $app->put('/groups/{id}/reassign/{newGroupId}', \Group\controllers\GroupController::class . ':reassignUsers'); $app->post('/groups/{id}/privileges/{privilegeId}', \Group\controllers\PrivilegeController::class . ':addPrivilege'); $app->delete('/groups/{id}/privileges/{privilegeId}', \Group\controllers\PrivilegeController::class . ':removePrivilege'); -$app->put('/groups/{id}/privileges/{privilegeId}/parameters', \Group\controllers\PrivilegeController::class . ':updatePrivilegeParameters'); +$app->put('/groups/{id}/privileges/{privilegeId}/parameters', \Group\controllers\PrivilegeController::class . ':updateParameters'); //Histories $app->get('/histories', \History\controllers\HistoryController::class . ':get'); diff --git a/src/app/group/controllers/PrivilegeController.php b/src/app/group/controllers/PrivilegeController.php index a7f2654f8a69699156a7e48afac807ff3db3db79..ad2028551258d41b45e4ed7a438b82f041751999 100644 --- a/src/app/group/controllers/PrivilegeController.php +++ b/src/app/group/controllers/PrivilegeController.php @@ -86,7 +86,7 @@ class PrivilegeController return $response->withStatus(204); } - public static function updatePrivilegeParameters(Request $request, Response $response, array $args) + public static function updateParameters(Request $request, Response $response, array $args) { if (!PrivilegeController::hasPrivilege(['privilegeId' => 'admin_groups', 'userId' => $GLOBALS['id']])) { return $response->withStatus(403)->withJson(['errors' => 'Service forbidden']); @@ -97,10 +97,6 @@ class PrivilegeController return $response->withStatus(400)->withJson(['errors' => 'Group not found']); } - if (!Validator::stringType()->notEmpty()->validate($args['privilegeId'])) { - return $response->withStatus(400)->withJson(['errors' => 'Query privilegeId is empty or not a string']); - } - $data = $request->getParams(); if (!Validator::arrayType()->validate($data['parameters'])) { @@ -202,7 +198,7 @@ class PrivilegeController $privileges = PrivilegeModel::getByUserAndPrivilege(['userId' => $args['userId'], 'privilegeId' => 'admin_users']); $privileges = array_column($privileges, 'parameters'); - if ($privileges == null) { + if (empty($privileges)) { return false; } $assignable = []; diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php index be2a5a9ad7f09dfdf48fbe2b14c6da9b2f414997..d94c0f6c854f3a576273a2cf3e85365190845ac1 100644 --- a/src/app/resource/controllers/ExportController.php +++ b/src/app/resource/controllers/ExportController.php @@ -819,7 +819,8 @@ class ExportController return implode("\n", $parentLabels); } - private static function getCustomFieldValue(array $args) { + private static function getCustomFieldValue(array $args) + { ValidatorModel::notEmpty($args, ['custom', 'resId']); ValidatorModel::stringType($args, ['custom']); ValidatorModel::intVal($args, ['resId']);