dev/core#934 Fix regression on sorting activity tab by 'Added by' #14194
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
eileenmcnaughton
commented
May 3, 2019
api/v3/Activity.php
Outdated
| if (in_array(['source_contact_name', 'source_contact_name desc', 'source_contact_name asc'], $options['return'])) { | ||
| $sql->join( | ||
| 'source_contact', | ||
| '!joinType civicrm_activity_contact !alias ON (!alias.activity_id = a.id AND record_type_id = ' . CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_ActivityContact', 'record_type_id', 'Activity Source') . ')', |
There was a problem hiding this comment.
this isn't right yet
There was a problem hiding this comment.
needs to be a subquery with min or max around display name I think
There was a problem hiding this comment.
nope just checked & the UI only supports source contact - which is a one to one so simple join is fine
eileenmcnaughton
force-pushed
the
activity_sort
branch
from
ac7df61 to
1aec416
Compare
eileenmcnaughton
force-pushed
the
activity_sort
branch
2 times, most recently
from
472e1e2 to
beb8974
Compare
eileenmcnaughton
commented
May 4, 2019
| @@ -592,7 +586,6 @@ public function testGetActivitiesforContactSummary() { | |||
| 'activity_type_id' => NULL, | |||
| 'offset' => 0, | |||
| 'rowCount' => 0, | |||
| 'sort' => NULL, | |||
There was a problem hiding this comment.
I removed this by accident but I think it might not be a bad thing as it ensures enotices don't get thrown
eileenmcnaughton
force-pushed
the
activity_sort
branch
from
beb8974 to
ea1f17a
Compare
eileenmcnaughton
changed the title
eileenmcnaughton
force-pushed
the
activity_sort
branch
from
ea1f17a to
a6c2ebd
Compare
totten
added a commit
to totten/civicrm-core
that referenced
this pull request
May 6, 2019
This updates a line which was added in the past day (civicrm#14194) to ensure that the data is escaped.
totten
added a commit
to totten/civicrm-core
that referenced
this pull request
May 6, 2019
This updates a line which was added in the past day (civicrm#14194) to ensure that the data is escaped.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Fixes regression whereby source_name no longer sorts due to api not supporting it (yet)
Before
After
works
Technical Details
Note that handling target_name or assignee_name introduces a tonne of complexity due the 1->N relationship - ug. In the UI sort_name & target_name are sortable
Comments
Actually the PR doesn't even fix it yet :-(