Commit e76864b2 authored by François Agneray's avatar François Agneray
Browse files

Merge branch '33-modifier-le-separateur-pour-les-criteria' into 'develop'

#33 => done

Closes #33

See merge request !32
parents d2c907ac 5364cec7
Pipeline #1402 passed with stages
in 4 minutes and 58 seconds
...@@ -211,7 +211,7 @@ final class SearchAction ...@@ -211,7 +211,7 @@ final class SearchAction
* @param Dataset $dataset Represents the requested dataset * @param Dataset $dataset Represents the requested dataset
* @param string[] $listOfIds The substring of the url (parameter a) * @param string[] $listOfIds The substring of the url (parameter a)
*/ */
private function select(QueryBuilder $queryBuilder, Dataset $dataset, array $listOfIds): void private function select(QueryBuilder $queryBuilder, Dataset $dataset, array $listOfIds): array
{ {
$columns = array(); $columns = array();
$attributes = array(); $attributes = array();
...@@ -236,7 +236,7 @@ final class SearchAction ...@@ -236,7 +236,7 @@ final class SearchAction
{ {
$expressions = array(); $expressions = array();
foreach ($criteria as $criterion) { foreach ($criteria as $criterion) {
$params = $params = explode(':', $criterion); $params = $params = explode('::', $criterion);
$attribute = $this->getAttribute($dataset, (int) $params[0]); $attribute = $this->getAttribute($dataset, (int) $params[0]);
$column = $attribute->getTableName() . '.' . $attribute->getName(); $column = $attribute->getTableName() . '.' . $attribute->getName();
$columnType = $attribute->getType(); $columnType = $attribute->getType();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment