Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] [export] Cleaner handling of additional return properties #14774

Merged
merged 1 commit into from
Jul 10, 2019
Merged

[REF] [export] Cleaner handling of additional return properties #14774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions CRM/Export/BAO/Export.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,9 @@ public static function exportComponents(
);

$processor = new CRM_Export_BAO_ExportProcessor($exportMode, $fields, $queryOperator, $mergeSameHousehold, $isPostalOnly);
if ($moreReturnProperties) {
$processor->setAdditionalRequestedReturnProperties($moreReturnProperties);
}
$returnProperties = $processor->getReturnProperties();
$paymentTableId = $processor->getPaymentTableID();

Expand Down Expand Up @@ -215,15 +218,6 @@ public static function exportComponents(
CRM_Core_DAO::executeQuery($query);
}

if ($moreReturnProperties) {
// fix for CRM-7066
if (!empty($moreReturnProperties['group'])) {
unset($moreReturnProperties['group']);
$moreReturnProperties['groups'] = 1;
}
$returnProperties = array_merge($returnProperties, $moreReturnProperties);
}

if ($processor->getRequestedFields() &&
$processor->isPostalableOnly()
) {
Expand Down
35 changes: 34 additions & 1 deletion CRM/Export/BAO/ExportProcessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,39 @@ class CRM_Export_BAO_ExportProcessor {
*/
protected $householdsToSkip = [];

/**
* Additional fields to return.
*
* This doesn't make much sense when we have a fields set but search build add it's own onto
* the 'Primary fields' (all) option.
*
* @var array
*/
protected $additionalRequestedReturnProperties = [];

/**
* Get additional return properties.
*
* @return array
*/
public function getAdditionalRequestedReturnProperties() {
return $this->additionalRequestedReturnProperties;
}

/**
* Set additional return properties.
*
* @param array $value
*/
public function setAdditionalRequestedReturnProperties($value) {
// fix for CRM-7066
if (!empty($value['group'])) {
unset($value['group']);
$value['groups'] = 1;
}
$this->additionalRequestedReturnProperties = $value;
}

/**
* Get return properties by relationship.
* @return array
Expand Down Expand Up @@ -220,7 +253,7 @@ public function setRequestedFields($requestedFields) {
* @return array
*/
public function getReturnProperties() {
return $this->returnProperties;
return array_merge($this->returnProperties, $this->getAdditionalRequestedReturnProperties());
}

/**
Expand Down