Commit 2df356e9 authored by jaapjansma's avatar jaapjansma

Fixed issue with filtering on contact subtype.

parent 14102caf
# Version 1.9.0 (not yet released) # Version 1.9.0 (not yet released)
* Fixed issue with filtering on contact subtype.
# Version 1.8.0 # Version 1.8.0
* Added Manage Case Link field. * 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. * Fixed issue with dashlet opening in full screen.
# Version 1.7.1 # Version 1.7.1
......
...@@ -77,7 +77,7 @@ class ACLContactSource extends ContactSource { ...@@ -77,7 +77,7 @@ class ACLContactSource extends ContactSource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new OrClause($contactTypeClauses); $contactTypeClause = new OrClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
...@@ -88,7 +88,7 @@ class ACLContactSource extends ContactSource { ...@@ -88,7 +88,7 @@ class ACLContactSource extends ContactSource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new AndClause($contactTypeClauses); $contactTypeClause = new AndClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
......
...@@ -80,7 +80,7 @@ class ContactSource extends AbstractCivicrmEntitySource { ...@@ -80,7 +80,7 @@ class ContactSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new OrClause($contactTypeClauses); $contactTypeClause = new OrClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
...@@ -91,7 +91,7 @@ class ContactSource extends AbstractCivicrmEntitySource { ...@@ -91,7 +91,7 @@ class ContactSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new AndClause($contactTypeClauses); $contactTypeClause = new AndClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
......
...@@ -143,7 +143,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource { ...@@ -143,7 +143,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new OrClause($contactTypeClauses); $contactTypeClause = new OrClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
...@@ -154,7 +154,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource { ...@@ -154,7 +154,7 @@ class HouseholdSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new AndClause($contactTypeClauses); $contactTypeClause = new AndClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
......
...@@ -123,7 +123,7 @@ class IndividualSource extends AbstractCivicrmEntitySource { ...@@ -123,7 +123,7 @@ class IndividualSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new OrClause($contactTypeClauses); $contactTypeClause = new OrClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
...@@ -134,7 +134,7 @@ class IndividualSource extends AbstractCivicrmEntitySource { ...@@ -134,7 +134,7 @@ class IndividualSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new AndClause($contactTypeClauses); $contactTypeClause = new AndClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
......
...@@ -135,7 +135,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource { ...@@ -135,7 +135,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'LIKE', $contactTypeSearchName, 'String', TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new OrClause($contactTypeClauses); $contactTypeClause = new OrClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
...@@ -146,7 +146,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource { ...@@ -146,7 +146,7 @@ class OrganizationSource extends AbstractCivicrmEntitySource {
$contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE); $contactTypeClauses[] = new SimpleWhereClause($this->getSourceName(), 'contact_sub_type', 'NOT LIKE', $contactTypeSearchName, 'String',TRUE);
} }
if (count($contactTypeClauses)) { if (count($contactTypeClauses)) {
$contactTypeClause = new AndClause($contactTypeClauses); $contactTypeClause = new AndClause($contactTypeClauses, TRUE);
$entityDataFlow = $this->ensureEntity(); $entityDataFlow = $this->ensureEntity();
$entityDataFlow->addWhereClause($contactTypeClause); $entityDataFlow->addWhereClause($contactTypeClause);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment