From 749da260afcd3841af5e61815ca185f6f4d9b5e6 Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Wed, 1 May 2019 15:56:51 +0200
Subject: [PATCH] update
---
CRM/Dataprocessor/BAO/DataProcessor.php | 8 ++++----
CRM/Dataprocessor/BAO/DataProcessorSource.php | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CRM/Dataprocessor/BAO/DataProcessor.php b/CRM/Dataprocessor/BAO/DataProcessor.php
index 6e04ac4e..57625c53 100644
--- a/CRM/Dataprocessor/BAO/DataProcessor.php
+++ b/CRM/Dataprocessor/BAO/DataProcessor.php
@@ -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());
}
diff --git a/CRM/Dataprocessor/BAO/DataProcessorSource.php b/CRM/Dataprocessor/BAO/DataProcessorSource.php
index bdf8d0c7..13f30d96 100644
--- a/CRM/Dataprocessor/BAO/DataProcessorSource.php
+++ b/CRM/Dataprocessor/BAO/DataProcessorSource.php
@@ -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);
--
GitLab