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

Fix activity search to work by url params #15990

Merged
merged 1 commit into from
Nov 30, 2019

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Fixes activity search for url params

Before

civicrm/activity/search?reset=1&force=1&activity_date_time_high=20180101 does not apply a filter

After

civicrm/activity/search?reset=1&force=1&activity_date_time_high=20180101 applies a filter

Technical Details

It seems to be missing the call to the parent fn

Note I feel like the parent should also handle some of the rows below in future

Comments

@seamuslee001 in response to your comment here #15942 (comment)

@civibot
Copy link

civibot bot commented Nov 29, 2019

(Standard links)

@civibot civibot bot added the master label Nov 29, 2019
$this->_submitValues = $this->_formValues;
}
}
parent::preProcess();

if (empty($this->_formValues)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The parent fn doesn't seem to do these rows - but should

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed on that

@seamuslee001
Copy link
Contributor

@eileenmcnaughton should we remove L195 as well?

@seamuslee001
Copy link
Contributor

@eileenmcnaughton just performed an r-run on this

Date field works perfectly
trying to use activity_text you can but get an e-notice
the sort_name param doesn't seem to do anything

@seamuslee001
Copy link
Contributor

@eileenmcnaughton this fixes the e-notice for me when using &activity_text=xxx

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index 3f2758b838..d9397a5cd9 100644
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -457,6 +457,9 @@ class CRM_Activity_BAO_Query {
       'title' => ts('Activity Text'),
       'type' => CRM_Utils_Type::T_STRING,
       'is_pseudofield' => TRUE,
+      'html' => [
+        'type' => 'Text',
+      ],
     ];
     return $metadata;
   }

It seems to be missing the call to the parent fn

Note I feel like the parent should also handle some of the rows below in future
@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 done

@eileenmcnaughton
Copy link
Contributor Author

test this please

@seamuslee001
Copy link
Contributor

(CiviCRM Review Template WORD-1.2)

@seamuslee001 seamuslee001 merged commit bb3a3d0 into civicrm:master Nov 30, 2019
@seamuslee001 seamuslee001 deleted the act_search branch November 30, 2019 01:56
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.

2 participants