Skip to content

Commit 6ba4921

Browse files
committed
#162. Fix binding by adding entity_id to select when data param passed with fields in uri for view
1 parent bea5b5d commit 6ba4921

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/Extension/ApiController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
use SoliDry\Helpers\JsonApiResponse;
1313
use SoliDry\Types\HTTPMethodsInterface;
1414
use SoliDry\Types\JwtInterface;
15-
use SoliDry\Types\ModelsInterface;
1615
use SoliDry\Helpers\Json;
1716
use SoliDry\Types\PhpInterface;
1817

@@ -139,11 +138,9 @@ public function index(Request $request) : Response
139138
public function view(Request $request, $id) : Response
140139
{
141140
$meta = [];
142-
$data = ($request->input(ModelsInterface::PARAM_DATA) === null) ? ModelsInterface::DEFAULT_DATA
143-
: Json::decode(urldecode($request->input(ModelsInterface::PARAM_DATA)));
144141
$sqlOptions = $this->setSqlOptions($request);
145142
$sqlOptions->setId($id);
146-
$sqlOptions->setData($data);
143+
$data = $sqlOptions->getData();
147144

148145
if ($this->isTree === true) {
149146
$tree = $this->getSubTreeEntities($sqlOptions, $id);

src/Extension/OptionsTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ private function setSqlOptions(Request $request) : SqlOptions
5050
$sort = ($request->input(ModelsInterface::PARAM_SORT) === null) ? $this->defaultSort :
5151
$request->input(ModelsInterface::PARAM_SORT);
5252

53-
$data = ($request->input(ModelsInterface::PARAM_DATA) === null) ? ModelsInterface::DEFAULT_DATA
54-
: Json::decode($request->input(ModelsInterface::PARAM_DATA));
53+
$data = ($request->input(ModelsInterface::PARAM_DATA) === NULL) ? ModelsInterface::DEFAULT_DATA
54+
: Json::decode(urldecode($request->input(ModelsInterface::PARAM_DATA)));
5555
$orderBy = ($request->input(ModelsInterface::PARAM_ORDER_BY) === null) ? [ApiInterface::RAML_ID => $sort]
5656
: Json::decode($request->input(ModelsInterface::PARAM_ORDER_BY));
5757
$filter = ($request->input(ModelsInterface::PARAM_FILTER) === null) ? [] : Json::decode($request->input(ModelsInterface::PARAM_FILTER));

0 commit comments

Comments
 (0)