diff --git a/CRM/DataprocessorSearch/Form/AbstractSearch.php b/CRM/DataprocessorSearch/Form/AbstractSearch.php
index cbdeb4de02388ec07073c961ab2bbd82d8b4eb28..e351deef5c7eb2fa2479dac5b2f1f825634eed73 100644
--- a/CRM/DataprocessorSearch/Form/AbstractSearch.php
+++ b/CRM/DataprocessorSearch/Form/AbstractSearch.php
@@ -371,7 +371,7 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
$this->alterRows($rows, $ids);
$this->addElement('checkbox', 'toggleSelect', NULL, NULL, ['class' => 'select-rows']);
- $this->assign('rows', $rows);
+ $this->assign('dataprocessor_rows', $rows);
$this->assign('no_result_text', $this->getNoResultText());
$this->assign('showLink', $showLink);
try {
@@ -392,20 +392,7 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
* Function to retrieve the entity ids
*/
protected function retrieveEntityIds() {
- try {
- $this->dataProcessorClass->getDataFlow()->setLimit(false);
- $this->dataProcessorClass->getDataFlow()->setOffset(0);
- $this->entityIDs = [];
- $id_field = $this->getIdFieldName();
- while($record = $this->dataProcessorClass->getDataFlow()->nextRecord()) {
- if (!empty($id_field) && isset($record[$id_field])) {
- $this->entityIDs[] = $record[$id_field]->rawValue;
- }
- }
- } catch (EndOfFlowException|DataFlowException|InvalidFlowException $e) {
- // Do nothing
- }
- $this->controller->set('entityIds', $this->entityIDs);
+ // Could be overriden in child classes.
}
/**
@@ -607,7 +594,21 @@ abstract class CRM_DataprocessorSearch_Form_AbstractSearch extends CRM_Dataproce
}
}
} else {
- if (isset($this->_formValues['radio_ts']) && $this->_formValues['radio_ts'] == 'ts_sel') {
+ if (isset($this->_formValues['radio_ts']) && $this->_formValues['radio_ts'] == 'ts_all') {
+ try {
+ $this->dataProcessorClass->getDataFlow()->setLimit(FALSE);
+ $this->dataProcessorClass->getDataFlow()->setOffset(0);
+ $id_field = $this->getIdFieldName();
+ while ($record = $this->dataProcessorClass->getDataFlow()
+ ->nextRecord()) {
+ if (!empty($id_field) && isset($record[$id_field])) {
+ $selectedIds[] = $record[$id_field]->rawValue;
+ }
+ }
+ } catch (EndOfFlowException|DataFlowException|InvalidFlowException $e) {
+ // Do nothing
+ }
+ } elseif (isset($this->_formValues['radio_ts']) && $this->_formValues['radio_ts'] == 'ts_sel') {
foreach ($this->_formValues as $name => $value) {
if (substr($name, 0, CRM_Core_Form::CB_PREFIX_LEN) == CRM_Core_Form::CB_PREFIX) {
$selectedIds[] = substr($name, CRM_Core_Form::CB_PREFIX_LEN);
diff --git a/CRM/DataprocessorSearch/Form/ActivitySearch.php b/CRM/DataprocessorSearch/Form/ActivitySearch.php
index 1f7e06ed64190782b960d149e2ad3c16fd99a13e..9c105518581aae14fe4ea0c38940d18321fcf3e9 100644
--- a/CRM/DataprocessorSearch/Form/ActivitySearch.php
+++ b/CRM/DataprocessorSearch/Form/ActivitySearch.php
@@ -145,12 +145,11 @@ class CRM_DataprocessorSearch_Form_ActivitySearch extends CRM_DataprocessorSearc
* all records are populated.
*/
protected function retrieveEntityIds() {
- parent::retrieveEntityIds();
$this->_queryParams[0] = array(
'activity_id',
'=',
array(
- 'IN' => $this->entityIDs,
+ 'IN' => $this->getSelectedIds(),
),
0,
0
diff --git a/CRM/DataprocessorSearch/Form/CaseSearch.php b/CRM/DataprocessorSearch/Form/CaseSearch.php
index 67316bd7729e630397496c2f41d13f9e8c7ac792..54317dff4ed60704981d306f4de43549c45b63d9 100644
--- a/CRM/DataprocessorSearch/Form/CaseSearch.php
+++ b/CRM/DataprocessorSearch/Form/CaseSearch.php
@@ -152,12 +152,11 @@ class CRM_DataprocessorSearch_Form_CaseSearch extends CRM_DataprocessorSearch_Fo
* all records are populated.
*/
protected function retrieveEntityIds() {
- parent::retrieveEntityIds();
$this->_queryParams[0] = array(
'case_id',
'=',
array(
- 'IN' => $this->entityIDs,
+ 'IN' => $this->getSelectedIds(),
),
0,
0
diff --git a/CRM/DataprocessorSearch/Form/ContributionSearch.php b/CRM/DataprocessorSearch/Form/ContributionSearch.php
index cfea7e11a50d2303376b2ebde020885df66c5257..4cfaadcbf3b5399d3b7728e090a54acad3943150 100644
--- a/CRM/DataprocessorSearch/Form/ContributionSearch.php
+++ b/CRM/DataprocessorSearch/Form/ContributionSearch.php
@@ -114,12 +114,11 @@ class CRM_DataprocessorSearch_Form_ContributionSearch extends CRM_DataprocessorS
* the next step only the selected record, or all records are populated.
*/
protected function retrieveEntityIds() {
- parent::retrieveEntityIds();
$this->_queryParams[0] = array(
'contribution_id',
'=',
array(
- 'IN' => $this->entityIDs,
+ 'IN' => $this->getSelectedIds(),
),
0,
0
diff --git a/CRM/DataprocessorSearch/Form/MembershipSearch.php b/CRM/DataprocessorSearch/Form/MembershipSearch.php
index 9ac7877b725633d38c2270a47c68eef22ca72af8..7476f02c26fdfc0c0d1607443c54394b22fa1ba5 100644
--- a/CRM/DataprocessorSearch/Form/MembershipSearch.php
+++ b/CRM/DataprocessorSearch/Form/MembershipSearch.php
@@ -123,12 +123,11 @@ class CRM_DataprocessorSearch_Form_MembershipSearch extends CRM_DataprocessorSea
* or all records are populated.
*/
protected function retrieveEntityIds() {
- parent:;$this->retrieveEntityIds();
$this->_queryParams[0] = array(
'membership_id',
'=',
array(
- 'IN' => $this->entityIDs,
+ 'IN' => $this->getSelectedIds(),
),
0,
0
diff --git a/CRM/DataprocessorSearch/Form/ParticipantSearch.php b/CRM/DataprocessorSearch/Form/ParticipantSearch.php
index 3887edf1e5b0bca003cbf21961e8aaff49cca798..9ad9f0e3afe91595047cb1b628fa5f78e73bece2 100644
--- a/CRM/DataprocessorSearch/Form/ParticipantSearch.php
+++ b/CRM/DataprocessorSearch/Form/ParticipantSearch.php
@@ -114,12 +114,11 @@ class CRM_DataprocessorSearch_Form_ParticipantSearch extends CRM_DataprocessorSe
* or all records are populated.
*/
protected function retrieveEntityIds() {
- parent::retrieveEntityIds();
$this->_queryParams[0] = array(
'participant_id',
'=',
array(
- 'IN' => $this->entityIDs,
+ 'IN' => $this->getSelectedIds(),
),
0,
0
diff --git a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
index be3baae6af349cb961fc5680e6ef2216407985c7..208623cceff40402ed96b53da8aede73bb99ac28 100644
--- a/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
+++ b/templates/CRM/Contact/Form/DataProcessorContactSearch.tpl
@@ -9,7 +9,7 @@
{include file="CRM/DataprocessorSearch/Form/Debug.tpl"}
-{if (isset($rows) && !empty($rows))}
+{if (isset($dataprocessor_rows) && !empty($dataprocessor_rows))}
<div class="crm-content-block">
<div class="crm-results-block">
{* This section handles form elements for action task select and submit *}
@@ -42,7 +42,7 @@
</tr></thead>
- {foreach from=$rows item=row}
+ {foreach from=$dataprocessor_rows item=row}
<tr id='rowid{$row.id}' class="{cycle values="odd-row,even-row"}">
{assign var=cbName value=$row.checkbox}
{assign var=id value=$row.id}
diff --git a/templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl b/templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
index 37752ccd2d32a838cb628dc9a337b8bcb407bf9c..441d91a1917290a1372ebf839eb45795aba2ac18 100644
--- a/templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
+++ b/templates/CRM/Dataprocessor/Form/Output/UIOutput/CriteriaForm.tpl
@@ -1,7 +1,7 @@
{crmScope extensionKey='dataprocessor'}
{if $has_exposed_filters}
<div class="crm-form-block crm-search-form-block">
- <div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if (!empty($rows))}collapsed{/if}">
+ <div class="crm-accordion-wrapper crm-advanced_search_form-accordion {if (!empty($dataprocessor_rows))}collapsed{/if}">
<div class="crm-accordion-header crm-master-accordion-header">
{if isset($criteriaFormTitle)}{$criteriaFormTitle}{else}{ts}Edit Search Criteria{/ts}{/if}
</div>
diff --git a/templates/CRM/DataprocessorSearch/Form/Search.tpl b/templates/CRM/DataprocessorSearch/Form/Search.tpl
index 310e45097c38280f250a5a9ec78ee474ee73c61d..070dfa3ea8eb662283fe73c34372da70cfe0af85 100644
--- a/templates/CRM/DataprocessorSearch/Form/Search.tpl
+++ b/templates/CRM/DataprocessorSearch/Form/Search.tpl
@@ -10,7 +10,7 @@
{include file="CRM/DataprocessorSearch/Form/Debug.tpl"}
-{if (isset($rows) && !empty($rows))}
+{if (isset($dataprocessor_rows) && !empty($dataprocessor_rows))}
<div class="crm-content-block">
<div class="crm-results-block">
{* This section handles form elements for action task select and submit *}
@@ -44,7 +44,7 @@
</tr></thead>
- {foreach from=$rows item=row}
+ {foreach from=$dataprocessor_rows item=row}
<tr id='rowid{$row.id}' class="{cycle values="odd-row,even-row"}">
{assign var=cbName value=$row.checkbox}
{assign var=id value=$row.id}