Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Extensions
dataprocessor
Commits
2df356e9
Commit
2df356e9
authored
May 28, 2020
by
jaapjansma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with filtering on contact subtype.
parent
14102caf
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
11 deletions
+12
-11
CHANGELOG.md
CHANGELOG.md
+2
-1
Civi/DataProcessor/Source/Contact/ACLContactSource.php
Civi/DataProcessor/Source/Contact/ACLContactSource.php
+2
-2
Civi/DataProcessor/Source/Contact/ContactSource.php
Civi/DataProcessor/Source/Contact/ContactSource.php
+2
-2
Civi/DataProcessor/Source/Contact/HouseholdSource.php
Civi/DataProcessor/Source/Contact/HouseholdSource.php
+2
-2
Civi/DataProcessor/Source/Contact/IndividualSource.php
Civi/DataProcessor/Source/Contact/IndividualSource.php
+2
-2
Civi/DataProcessor/Source/Contact/OrganizationSource.php
Civi/DataProcessor/Source/Contact/OrganizationSource.php
+2
-2
No files found.
CHANGELOG.md
View file @
2df356e9
# Version 1.9.0 (not yet released)
*
Fixed issue with filtering on contact subtype.
# Version 1.8.0
*
Added Manage Case Link field.
*
Added checkbox to show Manage Case on the Case Search output.
*
Added checkbox to show Manage Case on the Case Search output.
*
Fixed issue with dashlet opening in full screen.
# Version 1.7.1
...
...
Civi/DataProcessor/Source/Contact/ACLContactSource.php
View file @
2df356e9
...
...
@@ -77,7 +77,7 @@ class ACLContactSource extends ContactSource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
@@ -88,7 +88,7 @@ class ACLContactSource extends ContactSource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'NOT LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
Civi/DataProcessor/Source/Contact/ContactSource.php
View file @
2df356e9
...
...
@@ -80,7 +80,7 @@ class ContactSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
@@ -91,7 +91,7 @@ class ContactSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'NOT LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
Civi/DataProcessor/Source/Contact/HouseholdSource.php
View file @
2df356e9
...
...
@@ -143,7 +143,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
@@ -154,7 +154,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'NOT LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
Civi/DataProcessor/Source/Contact/IndividualSource.php
View file @
2df356e9
...
...
@@ -123,7 +123,7 @@ class IndividualSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
@@ -134,7 +134,7 @@ class IndividualSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'NOT LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
Civi/DataProcessor/Source/Contact/OrganizationSource.php
View file @
2df356e9
...
...
@@ -135,7 +135,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
OrClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
@@ -146,7 +146,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource {
$contactTypeClauses
[]
=
new
SimpleWhereClause
(
$this
->
getSourceName
(),
'contact_sub_type'
,
'NOT LIKE'
,
$contactTypeSearchName
,
'String'
,
TRUE
);
}
if
(
count
(
$contactTypeClauses
))
{
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
);
$contactTypeClause
=
new
AndClause
(
$contactTypeClauses
,
TRUE
);
$entityDataFlow
=
$this
->
ensureEntity
();
$entityDataFlow
->
addWhereClause
(
$contactTypeClause
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment