diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 0cb2ec2f8a8cf858c276711fc49a2a1b5a6da97a..829c6c1f51604897acceb59a095a21250b5961e9 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -688,9 +688,9 @@ class ResController ListInstanceModel::create([ 'res_id' => $args['resId'], 'sequence' => 0, - 'item_id' => $diffusion['item_id'], - 'item_type' => $diffusion['item_type'], - 'item_mode' => $diffusion['item_mode'], + 'item_id' => $diffusion['id'], + 'item_type' => $diffusion['type'], + 'item_mode' => $diffusion['mode'], 'added_by_user' => $GLOBALS['userId'], 'difflist_type' => 'entity_id' ]); @@ -845,21 +845,21 @@ class ResController } $destFound = false; foreach ($body['diffusion'] as $key => $diffusion) { - if ($diffusion['item_mode'] == 'dest') { + if ($diffusion['mode'] == 'dest') { if ($destFound) { return ['errors' => "Body diffusion has multiple dest"]; } $destFound = true; } - if ($diffusion['item_type'] == 'user_id') { - $user = UserModel::getByLogin(['login' => $diffusion['item_id'], 'select' => [1]]); + if ($diffusion['type'] == 'user_id') { + $user = UserModel::getByLogin(['login' => $diffusion['id'], 'select' => [1]]); if (empty($user)) { - return ['errors' => "Body diffusion[{$key}] item_id does not exist"]; + return ['errors' => "Body diffusion[{$key}] id does not exist"]; } } else { - $entity = EntityModel::getByEntityId(['entityId' => $diffusion['item_id'], 'select' => [1]]); + $entity = EntityModel::getByEntityId(['entityId' => $diffusion['id'], 'select' => [1]]); if (empty($entity)) { - return ['errors' => "Body diffusion[{$key}] item_id does not exist"]; + return ['errors' => "Body diffusion[{$key}] id does not exist"]; } } } diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php index a1cd5e21e94b92c73d64bcd8907e6f0754021a49..47bbc09502b703566d39834d57969c59703c59cf 100755 --- a/src/app/resource/controllers/StoreController.php +++ b/src/app/resource/controllers/StoreController.php @@ -28,8 +28,8 @@ class StoreController { public static function storeResource(array $args) { - ValidatorModel::notEmpty($args, ['encodedFile', 'format', 'status', 'doctype', 'modelId']); - ValidatorModel::stringType($args, ['format', 'status']); + ValidatorModel::notEmpty($args, ['encodedFile', 'format', 'doctype', 'modelId']); + ValidatorModel::stringType($args, ['format']); ValidatorModel::intVal($args, ['doctype', 'modelId']); try {