[REF] Consolidate retrieval of searchFormValues #18591
Merged
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)
|
| $values = $this->controller->exportValues('Custom'); | ||
| } | ||
| else { | ||
| if ($entityShortname !== 'Contact') { |
There was a problem hiding this comment.
entityShortName will be contact if $this->get('entity') !== 'Contact'
eileenmcnaughton
force-pushed
the
search
branch
from
fa51c16 to
8ec0637
Compare
colemanw
reviewed
Sep 25, 2020
CRM/Event/Form/Search.php
Outdated
| @@ -79,6 +79,9 @@ public function getDefaultEntity() { | |||
| * @throws \CiviCRM_API3_Exception | |||
| */ | |||
| public function preProcess() { | |||
| // SearchFormName is deprecated & to be removed - the replacement is for the task to | |||
| // call $this->form->getFormValues() | |||
There was a problem hiding this comment.
I think all these new comment blocks have a typo. Shouldn't it be
Suggested change
| // call $this->form->getFormValues() | |
| // call $this->form->getSearchFormValues() |
There was a problem hiding this comment.
oh yeah - I renamed the fn - will fix
There was a problem hiding this comment.
@colemanw fixed
Currently there are 3 ways in which the values from the searchForm are retrieved 1) the search form sets a value 'searchFormName' on the form during search which can be later retrieved 2) the search task has an action that reflects the form it came from 3) as per 2 but there is additional handling for the fact it might be the contact search (knowable because the entity has been set to 'Contact' I'm not 100% sure at this stage that the selected method (3) in this PR is the best - but it seems 'as good' as 1 with less form-state stuff and this PR consolidates it into 1 place so it is handled consistently
eileenmcnaughton
force-pushed
the
search
branch
from
8ec0637 to
2d09a0c
Compare
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
[REF] Consolidate retrieval of searchFormValues
Before
Currently there are 3 ways in which the values from the searchForm are retrieved
be later retrieved
the contact search (knowable because the entity has been set to 'Contact'
After
used in all places - it uses method 3
Technical Details
I'm not 100% sure at this stage that the selected method (3) in this PR is the best -
but it seems 'as good' as 1 with less form-state stuff and this PR consolidates it
into 1 place so it is handled consistently
Comments