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

update

parent b2d9d372
No related branches found
No related tags found
No related merge requests found
......@@ -257,7 +257,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc
$dataProcessor = $factory->getDataProcessorTypeByName($this->type);
$sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $this->id, 'options' => array('limit' => 0)));
foreach($sources['values'] as $sourceDao) {
CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor);
CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor);
}
$aggregationFields = CRM_Dataprocessor_BAO_DataProcessor::getAvailableAggregationFields($this->id);
......@@ -304,7 +304,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc
$dataProcessor = $factory->getDataProcessorTypeByName($dao->type);
$sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $data_processor_id, 'options' => array('limit' => 0)));
foreach($sources['values'] as $sourceDao) {
CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor);
CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor);
}
return $dataProcessor->getAvailableOutputHandlers();
......@@ -318,7 +318,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc
$dataProcessor = $factory->getDataProcessorTypeByName($dao->type);
$sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $dao->id, 'options' => array('limit' => 0)));
foreach($sources['values'] as $sourceDao) {
CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor);
CRM_Dataprocessor_BAO_DataProcessorSource::addSourceToDataProcessor($sourceDao, $dataProcessor);
}
return $dataProcessor->getAvailableFilterHandlers();
......@@ -340,7 +340,7 @@ class CRM_Dataprocessor_BAO_DataProcessor extends CRM_Dataprocessor_DAO_DataProc
$dataProcessor = $factory->getDataProcessorTypeByName($dao->type);
$sources = civicrm_api3('DataProcessorSource', 'get', array('data_processor_id' => $dao->id, 'options' => array('limit' => 0)));
foreach($sources['values'] as $sourceDao) {
$source = CRM_Dataprocessor_BAO_DataProcessorSource::getSourceClass($sourceDao, $dataProcessor);
$source = CRM_Dataprocessor_BAO_DataProcessorSource::sourceToSourceClass($sourceDao);
$availableAggregationFields = array_merge($availableAggregationFields, $source->getAvailableAggregationFields());
}
......
......@@ -75,7 +75,7 @@ class CRM_Dataprocessor_BAO_DataProcessorSource extends CRM_Dataprocessor_DAO_Da
* @param \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor
* @return \Civi\DataProcessor\Source\SourceInterface
*/
public static function getSourceClass($source, \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor) {
public static function addSourceToDataProcessor($source, \Civi\DataProcessor\ProcessorType\AbstractProcessorType $dataProcessor) {
$factory = dataprocessor_get_factory();
$sourceClass = self::sourceToSourceClass($source);
$sourceClass->setDataProcessor($dataProcessor);
......
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