File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change 12
12
use SoliDry \Helpers \JsonApiResponse ;
13
13
use SoliDry \Types \HTTPMethodsInterface ;
14
14
use SoliDry \Types \JwtInterface ;
15
- use SoliDry \Types \ModelsInterface ;
16
15
use SoliDry \Helpers \Json ;
17
16
use SoliDry \Types \PhpInterface ;
18
17
@@ -139,11 +138,9 @@ public function index(Request $request) : Response
139
138
public function view (Request $ request , $ id ) : Response
140
139
{
141
140
$ meta = [];
142
- $ data = ($ request ->input (ModelsInterface::PARAM_DATA ) === null ) ? ModelsInterface::DEFAULT_DATA
143
- : Json::decode (urldecode ($ request ->input (ModelsInterface::PARAM_DATA )));
144
141
$ sqlOptions = $ this ->setSqlOptions ($ request );
145
142
$ sqlOptions ->setId ($ id );
146
- $ sqlOptions ->setData ( $ data );
143
+ $ data = $ sqlOptions ->getData ( );
147
144
148
145
if ($ this ->isTree === true ) {
149
146
$ tree = $ this ->getSubTreeEntities ($ sqlOptions , $ id );
Original file line number Diff line number Diff line change @@ -50,8 +50,8 @@ private function setSqlOptions(Request $request) : SqlOptions
50
50
$ sort = ($ request ->input (ModelsInterface::PARAM_SORT ) === null ) ? $ this ->defaultSort :
51
51
$ request ->input (ModelsInterface::PARAM_SORT );
52
52
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 ) ));
55
55
$ orderBy = ($ request ->input (ModelsInterface::PARAM_ORDER_BY ) === null ) ? [ApiInterface::RAML_ID => $ sort ]
56
56
: Json::decode ($ request ->input (ModelsInterface::PARAM_ORDER_BY ));
57
57
$ filter = ($ request ->input (ModelsInterface::PARAM_FILTER ) === null ) ? [] : Json::decode ($ request ->input (ModelsInterface::PARAM_FILTER ));
You can’t perform that action at this time.
0 commit comments