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.

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

dev/core#3503, dev/core#3492 Fix grant exports and relative dates #23904

Merged
merged 1 commit into from
Jul 5, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Jun 29, 2022

Fixes https://lab.civicrm.org/dev/core/-/issues/3503 and https://lab.civicrm.org/dev/core/-/issues/3492

They both stem from the wrong fix for https://lab.civicrm.org/dev/core/-/issues/3069

Refer to the gitlab for some famous last words....

@civibot
Copy link

civibot bot commented Jun 29, 2022

(Standard links)

@civibot civibot bot added the 5.51 label Jun 29, 2022
This both stem from the wrong fix for https://lab.civicrm.org/dev/core/-/issues/3069

Refer to the gitlab for some famous last words....
@demeritcowboy
Copy link
Contributor

Did some clicking around. It solves both issues without reintroducing the older issue. One thing is "amount requested" is not available as an export choice with selected fields, although it appears when exporting primary fields. There is "total amount" available when doing selected fields. I'm not sure if it was always that way - will try to check.

@demeritcowboy
Copy link
Contributor

Looking at a 5.45 site it seems it was the same before - you can select total_amount, but not amount_requested, but if you do primary fields then it outputs amount_requested but not total_amount.

$extFields = [];
foreach ($this->getSearchQueryObjects() as $obj) {
// Get Fields is ambiguous about the
$fields = method_exists($obj, 'getContactFields') ? $obj->getContactFields() : $obj->getFields();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment is

@demeritcowboy demeritcowboy added the merge ready PR will be merged after a few days if there are no objections label Jun 29, 2022
@seamuslee001
Copy link
Contributor

I'm going to merge this as it has been merge ready for a few days

@seamuslee001 seamuslee001 merged commit 3cf2f2b into civicrm:5.51 Jul 5, 2022
@seamuslee001 seamuslee001 deleted the grant branch July 5, 2022 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5.51 merge ready PR will be merged after a few days if there are no objections
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants