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

Select correct activity if more than one in upcoming or recent period #9011

Merged
merged 1 commit into from
Oct 18, 2016

Conversation

jernic
Copy link
Contributor

@jernic jernic commented Sep 11, 2016

Currently if there are two or more "upcoming" or "recent" activities, the wrong activity is being selected. Changed the SQL query to make sure that the earliest upcoming activity, and the latest recent activity is selected. I'm not very experienced with SQL, so this may not be the best way of achieving the desired result.

Currently if there are two or more "upcoming" or "recent" activities, the wrong activity is being selected. Changed the SQL query to make sure that the earliest upcoming activity, and the latest recent activity is selected.
@civicrm-builder
Copy link

Can one of the admins verify this patch?

@KarinG
Copy link
Contributor

KarinG commented Sep 12, 2016

Jenkins test this please

@jernic
Copy link
Contributor Author

jernic commented Sep 12, 2016

Note: I'm not sure about the LIMIT 1 condition - may be unnecessary or undesirable.

@colemanw
Copy link
Member

@civicrm-builder add to whitelist

Copy link
Contributor

@jitendrapurohit jitendrapurohit left a comment

Choose a reason for hiding this comment

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

Tested this, latest activities are shown correctly after the changes.

@monishdeb monishdeb merged commit fa71b5e into civicrm:master Oct 18, 2016
@jernic jernic deleted the jernic-patch-1 branch October 19, 2016 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants