From 64ffcefd0ae7dd9c170ba0d6e4eedfcc53af4dad Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Wed, 5 Dec 2018 07:44:07 +1100 Subject: [PATCH] [REF] Rename recently added getUrlVariables getFormVariables functions to be loadStandardSearchOptionsFromUrl loadFormValues --- CRM/Activity/Form/Search.php | 2 +- CRM/Campaign/Form/Search.php | 2 +- CRM/Case/Form/Search.php | 4 ++-- CRM/Contribute/Form/Search.php | 2 +- CRM/Core/Form/Search.php | 4 ++-- CRM/Event/Form/Search.php | 4 ++-- CRM/Grant/Form/Search.php | 4 ++-- CRM/Member/Form/Search.php | 2 +- CRM/Pledge/Form/Search.php | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index f9e4ebfaf0..93f2e8a93d 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -89,7 +89,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; $this->defaults = array(); - $this->getUrlVariables(); + $this->loadStandardSearchOptionsFromUrl(); // get user submitted values // get it from controller only if form has been submitted, else preProcess has set this diff --git a/CRM/Campaign/Form/Search.php b/CRM/Campaign/Form/Search.php index 4aa68e1272..418bba5748 100644 --- a/CRM/Campaign/Form/Search.php +++ b/CRM/Campaign/Form/Search.php @@ -77,7 +77,7 @@ class CRM_Campaign_Form_Search extends CRM_Core_Form_Search { $this->_printButtonName = $this->getButtonName('next', 'print'); $this->_actionButtonName = $this->getButtonName('next', 'action'); - $this->getUrlVariables(); + $this->loadStandardSearchOptionsFromUrl(); //operation for state machine. $this->_operation = CRM_Utils_Request::retrieve('op', 'String', $this, FALSE, 'reserve'); diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index bd5544e44b..45f0574044 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -89,8 +89,8 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; $this->defaults = array(); - $this->getUrlVariables(); - $this->getFormVariables(); + $this->loadStandardSearchOptionsFromUrl(); + $this->loadFormValues(); if ($this->_force) { $this->postProcess(); diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 07c9521bdd..337a9518f5 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -83,7 +83,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { // @todo - is this an error - $this->_defaults is used. $this->defaults = array(); - $this->getUrlVariables(); + $this->loadStandardSearchOptionsFromUrl(); // get user submitted values // get it from controller only if form has been submitted, else preProcess has set this diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php index 4ccd76ccd8..c77b728d00 100644 --- a/CRM/Core/Form/Search.php +++ b/CRM/Core/Form/Search.php @@ -321,7 +321,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form { * we allow the controller to set force/reset externally, useful when we are being * driven by the wizard framework */ - protected function getUrlVariables() { + protected function loadStandardSearchOptionsFromUrl() { $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean'); $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE); $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this); @@ -335,7 +335,7 @@ class CRM_Core_Form_Search extends CRM_Core_Form { * * Get it from controller only if form has been submitted, else preProcess has set this */ - protected function getFormVariables() { + protected function loadFormValues() { if (!empty($_POST) && !$this->controller->isModal()) { $this->_formValues = $this->controller->exportValues($this->_name); } diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php index 9f3ee026e6..24944f2ce1 100644 --- a/CRM/Event/Form/Search.php +++ b/CRM/Event/Form/Search.php @@ -90,8 +90,8 @@ class CRM_Event_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; $this->defaults = array(); - $this->getUrlVariables(); - $this->getFormVariables(); + $this->loadStandardSearchOptionsFromUrl(); + $this->loadFormValues(); if ($this->_force) { $this->postProcess(); diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php index 4d833d9708..6a63ab56a1 100644 --- a/CRM/Grant/Form/Search.php +++ b/CRM/Grant/Form/Search.php @@ -79,8 +79,8 @@ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; $this->defaults = array(); - $this->getUrlVariables(); - $this->getFormVariables(); + $this->loadStandardSearchOptionsFromUrl(); + $this->loadFormValues(); if ($this->_force) { $this->postProcess(); diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php index 764c19de1b..e7ab18f871 100644 --- a/CRM/Member/Form/Search.php +++ b/CRM/Member/Form/Search.php @@ -84,7 +84,7 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { $this->defaults = array(); - $this->getUrlVariables(); + $this->loadStandardSearchOptionsFromUrl(); // get user submitted values // get it from controller only if form has been submitted, else preProcess has set this diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index 81b536fc35..895d322362 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/Form/Search.php @@ -73,7 +73,7 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; $this->defaults = array(); - $this->getUrlVariables(); + $this->loadStandardSearchOptionsFromUrl(); // get user submitted values // get it from controller only if form has been submitted, else preProcess has set this -- 2.25.1