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

Fixed regression bug with custom fields on activity data sources.

parent afcaaca9
No related branches found
No related tags found
No related merge requests found
# Version 1.28 (not yet released)
# Version 1.28
* Fixed #73: Aggregation on SQL Source does not always work
* Fixed #40: SQL Table data source error and #45: Allow MySQL Views as Sources. See !71
* Fixed regression bug with custom fields on activity data sources.
# Version 1.27
......
......@@ -378,13 +378,14 @@ abstract class AbstractCivicrmEntitySource extends AbstractSource {
}
$customGroupTableAlias = $this->getSourceName().'_'.$customGroupName;
$this->ensureEntity(); // Ensure the entity as we need it before joining.
$join = new SimpleJoin($this->getSourceName(), 'id', $customGroupTableAlias, 'entity_id', 'LEFT');
$join->setDataProcessor($this->dataProcessor);
if (!$this->entityJoin) {
$this->entityJoin = new SimpleJoin($this->getSourceName(), 'id', $customGroupTableAlias, 'entity_id', 'LEFT');
$this->entityJoin->setDataProcessor($this->dataProcessor);
$this->entityJoin = $join;
}
$this->customGroupDataFlowDescriptions[$customGroupName] = new DataFlowDescription(
new SqlTableDataFlow($customGroupTableName, $customGroupTableAlias, new DataSpecification()),
$this->entityJoin
$join
);
$this->dataProcessor->resetDataFlow();
return $this->customGroupDataFlowDescriptions[$customGroupName]->getDataFlow();
......
......@@ -14,8 +14,8 @@
<url desc="Documentation">https://lab.civicrm.org/extensions/dataprocessor/blob/master/README.md</url>
<url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
</urls>
<releaseDate>2021-01-04</releaseDate>
<version>1.28-dev</version>
<releaseDate>2021-01-12</releaseDate>
<version>1.28</version>
<develStage>stable</develStage>
<compatibility>
<ver>4.7</ver>
......
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