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

fixed minor bugs

parent 157ad0eb
No related branches found
No related tags found
No related merge requests found
......@@ -20,8 +20,7 @@ class SimpleNonRequiredJoin extends SimpleJoin {
*/
protected $filterClauses = array();
public function __construct($left_prefix = null, $left_field = null, $right_prefix = null, $right_field = null, $type = "INNER") {
$type = 'LEFT';
public function __construct($left_prefix = null, $left_field = null, $right_prefix = null, $right_field = null, $type = "LEFT") {
parent::__construct($left_prefix, $left_field, $right_prefix, $right_field, $type);
}
......@@ -31,7 +30,6 @@ class SimpleNonRequiredJoin extends SimpleJoin {
* @return \Civi\DataProcessor\DataFlow\MultipleDataFlows\JoinInterface
*/
public function setConfiguration($configuration) {
$configuration[' type'] = 'LEFT';
return parent::setConfiguration($configuration);
}
......
......@@ -292,8 +292,6 @@ class Api implements OutputInterface, API_ProviderInterface, EventSubscriberInte
* @throws \Exception
*/
public function invoke($apiRequest) {
$isCountAction = FALSE;
switch (strtolower($apiRequest['action'])) {
case 'getfields':
// Do get fields
......@@ -310,6 +308,7 @@ class Api implements OutputInterface, API_ProviderInterface, EventSubscriberInte
}
protected function invokeDataProcessor($apiRequest) {
$isCountAction = FALSE;
$dataProcessorIdSql = "
SELECT *
FROM civicrm_data_processor_output o
......@@ -412,6 +411,9 @@ class Api implements OutputInterface, API_ProviderInterface, EventSubscriberInte
protected function checkForErrors($return) {
$session = \CRM_Core_Session::singleton();
$statuses = $session->getStatus(true);
if (is_array($statuses)) {
return $return;
}
foreach($statuses as $status) {
if ($status['type'] == 'error') {
$return['is_error'] = 1;
......
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