Commit 64ffcefd authored by Seamus Lee's avatar Seamus Lee

[REF] Rename recently added getUrlVariables getFormVariables functions to be...

[REF] Rename recently added getUrlVariables getFormVariables functions to be loadStandardSearchOptionsFromUrl loadFormValues
parent 07a18ea7
......@@ -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
......
......@@ -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');
......
......@@ -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();
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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();
......
......@@ -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();
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment