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

CRM-19447 activity details search #9536

Merged
merged 6 commits into from
Dec 30, 2016

Conversation

twomice
Copy link
Contributor

@twomice twomice commented Dec 14, 2016

This applies the requested changes from CRM-19447, on both the Activity Search and the Advanced Search.


@monishdeb
Copy link
Member

@twomice you can also add unit test on search form's formValues. Lemme cite an example https://github.com/civicrm/civicrm-core/pull/9506/files#diff-ebb82d7b9ab678b644e21a15f37a8e86R162

@twomice
Copy link
Contributor Author

twomice commented Dec 14, 2016

Thanks, @monishdeb. I will look at these.

@monishdeb monishdeb added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Dec 27, 2016
@twomice
Copy link
Contributor Author

twomice commented Dec 27, 2016

@monishdeb Regarding "you can also add unit test on search form's formValues": from the example, I'm not sure what I'm really testing, and accordingly where to locate the test (e.g., tests/phpunit/CRM/Contact/BAO/...what?) Can you offer any insight?

@monishdeb
Copy link
Member

@twomice here's few example how you can add unit-test on Search Form's form-values and even Qill string too.

  1. using Smart and/or Regular group filter testContactCombineGroupSearch in Advance Search
  2. using Group Type filter testbyGroupType in Advance Search
  3. using 'Is Batch' filter testBatchFilter in Find Contribution .

@twomice
Copy link
Contributor Author

twomice commented Dec 28, 2016

Sorry to ask @monishdeb, but Jenkins testing is failing to merge the PR now:

error: patch failed: CRM/Activity/BAO/Query.php:192
error: CRM/Activity/BAO/Query.php: patch does not apply
error: patch failed: CRM/Activity/Form/Search.php:195
error: CRM/Activity/Form/Search.php: patch does not apply
(https://test.civicrm.org/job/CiviCRM-Core-PR/13156/console)

Any suggestions what I can do to fix this?

@monishdeb monishdeb force-pushed the CRM-19447_activity_details_search branch from 2699763 to ce16dc1 Compare December 29, 2016 09:25
@monishdeb
Copy link
Member

@twomice I have updated the PR and test build passes :)

U might have missed --rebase, reason why there was a false merge commit.
Always do git pull --rebase upstream master to update your PR and in order to squash multiple commits into one do git rebase -i .. it will open a interactive console in vi edit.

@twomice
Copy link
Contributor Author

twomice commented Dec 29, 2016

Thanks @monishdeb! Let me know if the PR needs more work.

@monishdeb
Copy link
Member

monishdeb commented Dec 30, 2016

@twomice will do the QA. However some might want to have separate search filters for Activity details and subject respectively for sake of simplicity. But the current feature gives the ability to use the same filter for activity detail and/or subject, that's better

@twomice
Copy link
Contributor Author

twomice commented Dec 30, 2016

@monishdeb The intent of the functionality as describedin the ticket CRM-19447 is to emulate the behavior seen for Notes, as in Advanced Search > Notes > Note Text, with options "Body Only / Subject Only / Both". So this PR aims to do what's called for in the ticket. Hopefully that's acceptable.

@monishdeb
Copy link
Member

Oh ok, very well proceeding with QA. There are few scope for optimization and will update this PR with those changes.

@monishdeb monishdeb force-pushed the CRM-19447_activity_details_search branch from ce16dc1 to e4a70e4 Compare December 30, 2016 09:28
@monishdeb monishdeb force-pushed the CRM-19447_activity_details_search branch from e4a70e4 to 1cd7479 Compare December 30, 2016 09:31
@monishdeb
Copy link
Member

@twomice did some additional changes 1cd7479 please have a look. Will merge then after test builds passes

@monishdeb monishdeb removed the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Dec 30, 2016
@monishdeb
Copy link
Member

image

Top of the changes

@monishdeb monishdeb merged commit 97e420b into civicrm:master Dec 30, 2016
@twomice
Copy link
Contributor Author

twomice commented Dec 30, 2016

Those are great changes, @monishdeb Thanks for that, and for the merge!

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.

3 participants