Skip to content
Snippets Groups Projects
Commit a0342dbe authored by jaapjansma's avatar jaapjansma
Browse files

Fixed issue with certain multi value fields on the filter configuration of a data source.

parent 4878a0b3
No related branches found
Tags 1.117
No related merge requests found
# Version 1.116 (not yet released) # Version 1.116 (not yet released)
* Fixed issue with certain multi value fields on the filter configuration of a data source.
* Fixed issue with navigation menu. * Fixed issue with navigation menu.
# Version 1.115 # Version 1.115
......
...@@ -10,6 +10,7 @@ use Civi\DataProcessor\DataFlow\CombinedDataFlow\SubqueryDataFlow; ...@@ -10,6 +10,7 @@ use Civi\DataProcessor\DataFlow\CombinedDataFlow\SubqueryDataFlow;
use Civi\DataProcessor\DataFlow\MultipleDataFlows\JoinInterface; use Civi\DataProcessor\DataFlow\MultipleDataFlows\JoinInterface;
use Civi\DataProcessor\DataFlow\MultipleDataFlows\SimpleNonRequiredJoin; use Civi\DataProcessor\DataFlow\MultipleDataFlows\SimpleNonRequiredJoin;
use Civi\DataProcessor\DataFlow\MultipleDataFlows\SqlJoinInterface; use Civi\DataProcessor\DataFlow\MultipleDataFlows\SqlJoinInterface;
use Civi\DataProcessor\DataFlow\SqlDataFlow\MultiValueFieldWhereClause;
use Civi\DataProcessor\DataFlow\SqlDataFlow\PureSqlStatementClause; use Civi\DataProcessor\DataFlow\SqlDataFlow\PureSqlStatementClause;
use Civi\DataProcessor\DataFlow\SqlDataFlow\SimpleWhereClause; use Civi\DataProcessor\DataFlow\SqlDataFlow\SimpleWhereClause;
use Civi\DataProcessor\DataFlow\SqlTableDataFlow; use Civi\DataProcessor\DataFlow\SqlTableDataFlow;
...@@ -337,7 +338,12 @@ abstract class AbstractCivicrmEntitySource extends AbstractSource { ...@@ -337,7 +338,12 @@ abstract class AbstractCivicrmEntitySource extends AbstractSource {
} else { } else {
$this->ensureEntity(); $this->ensureEntity();
$tableAlias = $this->getEntityTableAlias(); $tableAlias = $this->getEntityTableAlias();
$this->entityDataFlow->addWhereClause(new SimpleWhereClause($tableAlias, $spec->name,$op, $values, $spec->type, TRUE)); if ($spec->isMultiValueField()) {
$clause = new MultiValueFieldWhereClause($tableAlias, $spec->name, $op, $values, $spec->type, TRUE);
} else {
$clause = new SimpleWhereClause($tableAlias, $spec->name,$op, $values, $spec->type, TRUE);
}
$this->entityDataFlow->addWhereClause($clause);
$this->addFilterToAggregationDataFlow($spec, $op, $values); $this->addFilterToAggregationDataFlow($spec, $op, $values);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment