Merge pull request #38 from bakaphp/fix/sort-relations

kaioken · web-flow · commit de36a46ef304 · 2020-03-06T13:11:25.000-04:00
set previous relationSearchFields value if we dont have rparams
diff --git a/src/Converter/RequestUriToSql.php b/src/Converter/RequestUriToSql.php
@@ -529,7 +529,7 @@ protected function prepareCustomSql(array $searchCriteria, Model $modules, strin
      */
     protected function prepareParams(array $unparsed): void
     {
-        $this->relationSearchFields = array_key_exists('rparams', $unparsed) ? $this->parseRelationParameters($unparsed['rparams']) : [];
+        $this->relationSearchFields = array_key_exists('rparams', $unparsed) ? $this->parseRelationParameters($unparsed['rparams']) : $this->relationSearchFields;
         $this->customSearchFields = array_key_exists('cparams', $unparsed) ? $this->parseSearchParameters($unparsed['cparams'])['mapped'] : [];
         $this->normalSearchFields = array_key_exists('params', $unparsed) ? $this->parseSearchParameters($unparsed['params'])['mapped'] : [];
     }

Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ protected function prepareCustomSql(array $searchCriteria, Model $modules, strin`
`529`	`529`	`*/`
`530`	`530`	`protected function prepareParams(array $unparsed): void`
`531`	`531`	`{`
`532`		`- $this->relationSearchFields = array_key_exists('rparams', $unparsed) ? $this->parseRelationParameters($unparsed['rparams']) : [];`
	`532`	`+ $this->relationSearchFields = array_key_exists('rparams', $unparsed) ? $this->parseRelationParameters($unparsed['rparams']) : $this->relationSearchFields;`
`533`	`533`	`$this->customSearchFields = array_key_exists('cparams', $unparsed) ? $this->parseSearchParameters($unparsed['cparams'])['mapped'] : [];`
`534`	`534`	`$this->normalSearchFields = array_key_exists('params', $unparsed) ? $this->parseSearchParameters($unparsed['params'])['mapped'] : [];`
`535`	`535`	`}`