jenkins-bot has submitted this change and it was merged.
Change subject: Revert "CRM-17075 further fix to handling entity reference in
search form"
......................................................................
Revert "CRM-17075 further fix to handling entity reference in search form"
This reverts commit 979dfac5c7d6de84b7e6641776e44f3e20e7585b.
This is a reversal of a change that is in the Fuzion repo but not 4.6 core & is
now rejected
from the fuzion repo (& ammended in 4.7)
Change-Id: Ic4d02abfed76f6484a17a11a46a4cdbf28f6387b
---
M CRM/Contact/Form/Task/SaveSearch.php
1 file changed, 1 insertion(+), 7 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/Contact/Form/Task/SaveSearch.php
b/CRM/Contact/Form/Task/SaveSearch.php
index a02371e..fc95203 100644
--- a/CRM/Contact/Form/Task/SaveSearch.php
+++ b/CRM/Contact/Form/Task/SaveSearch.php
@@ -187,13 +187,7 @@
//save the search
$savedSearch = new CRM_Contact_BAO_SavedSearch();
$savedSearch->id = $this->_id;
- // Use the query parameters rather than the form values - these have
already been assessed / converted
- // with the extra knowledge that the form has.
- // Note that we want to move towards a standardised way of saving the
query that is not
- // an exact match for the form requirements & task the form layer with
converting backwards and forwards.
- // Ideally per CRM-17075 we will use entity reference fields heavily in
the form layer & convert to the
- // sql operator syntax at the query layer.
- $savedSearch->form_values = serialize($this->get('queryParams'));
+ $savedSearch->form_values = serialize($this->get('formValues'));
$savedSearch->mapping_id = $mappingId;
$savedSearch->search_custom_id = $this->get('customSearchID');
$savedSearch->save();
--
To view, visit https://gerrit.wikimedia.org/r/249007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4d02abfed76f6484a17a11a46a4cdbf28f6387b
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: civi-4.6.9
Gerrit-Owner: Eileen <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
