Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dataprocessor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Don Wijesooriya
dataprocessor
Commits
f38823fb
Commit
f38823fb
authored
5 years ago
by
jaapjansma
Browse files
Options
Downloads
Patches
Plain Diff
fixed minor bugs
parent
157ad0eb
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Civi/DataProcessor/DataFlow/MultipleDataFlows/SimpleNonRequiredJoin.php
+1
-3
1 addition, 3 deletions
...ssor/DataFlow/MultipleDataFlows/SimpleNonRequiredJoin.php
Civi/DataProcessor/Output/Api.php
+4
-2
4 additions, 2 deletions
Civi/DataProcessor/Output/Api.php
with
5 additions
and
5 deletions
Civi/DataProcessor/DataFlow/MultipleDataFlows/SimpleNonRequiredJoin.php
+
1
−
3
View file @
f38823fb
...
...
@@ -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
);
}
...
...
This diff is collapsed.
Click to expand it.
Civi/DataProcessor/Output/Api.php
+
4
−
2
View file @
f38823fb
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment