From 7fa895538bc9be174bca5e172e5d46279e11d0eb Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 1 Apr 2020 11:51:26 +1100 Subject: [PATCH] [REF] Fix handling of owner url parameter from Membership Dashboard --- CRM/Member/Form/Search.php | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php index 759bf4e6db..b8bb22b8be 100644 --- a/CRM/Member/Form/Search.php +++ b/CRM/Member/Form/Search.php @@ -177,6 +177,22 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { return ts('Member Contact Type'); } + /** + * Set defaults. + * + * @return array + * @throws \Exception + */ + public function setDefaultValues() { + $this->_defaults = parent::setDefaultValues(); + //LCD also allow restrictions to membership owner via GET + $owner = CRM_Utils_Request::retrieve('owner', 'String'); + if (in_array($owner, ['0', '1'])) { + $this->_defaults['member_is_primary'] = $owner; + } + return $this->_defaults; + } + /** * The post processing of the form gets done here. * @@ -318,12 +334,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this ); - - //LCD also allow restrictions to membership owner via GET - $owner = CRM_Utils_Request::retrieve('owner', 'String'); - if (in_array($owner, ['0', '1'])) { - $this->_formValues['member_is_primary'] = $this->_defaults['member_is_primary'] = $owner; - } } /** -- 2.25.1