Commit 85ad766b authored by alexpott's avatar alexpott

Issue #2003438 by trevjs, heddn: Rename Views method operator_form() to operatorForm() .

parent ba4d4a88
......@@ -20,7 +20,7 @@
class Access extends FilterPluginBase {
public function adminSummary() { }
function operator_form(&$form, &$form_state) { }
protected function operatorForm(&$form, &$form_state) { }
public function canExpose() {
return FALSE;
}
......
......@@ -21,7 +21,7 @@ class Status extends FilterPluginBase {
public function adminSummary() { }
function operator_form(&$form, &$form_state) { }
protected function operatorForm(&$form, &$form_state) { }
public function canExpose() { return FALSE; }
......
......@@ -48,7 +48,7 @@ protected function defineOptions() {
/**
* Provide simple equality operator
*/
function operator_form(&$form, &$form_state) {
protected function operatorForm(&$form, &$form_state) {
$form['operator'] = array(
'#type' => 'radios',
'#title' => t('On empty input'),
......
......@@ -96,7 +96,7 @@ protected function defineOptions() {
return $options;
}
function operator_form(&$form, &$form_state) {
protected function operatorForm(&$form, &$form_state) {
$form['operator'] = array();
}
......
......@@ -216,7 +216,7 @@ public function buildOptionsForm(&$form, &$form_state) {
}
}
else {
// Add the subform from operator_form().
// Add the subform from operatorForm().
$this->showOperatorForm($form, $form_state);
// Add the subform from valueForm().
$this->showValueForm($form, $form_state);
......@@ -266,7 +266,7 @@ public function submitOptionsForm(&$form, &$form_state) {
* Shortcut to display the operator form.
*/
public function showOperatorForm(&$form, &$form_state) {
$this->operator_form($form, $form_state);
$this->operatorForm($form, $form_state);
$form['operator']['#prefix'] = '<div class="views-group-box views-left-30">';
$form['operator']['#suffix'] = '</div>';
}
......@@ -279,7 +279,7 @@ public function showOperatorForm(&$form, &$form_state) {
*
* @see buildOptionsForm()
*/
function operator_form(&$form, &$form_state) {
protected function operatorForm(&$form, &$form_state) {
$options = $this->operatorOptions();
if (!empty($options)) {
$form['operator'] = array(
......@@ -293,7 +293,7 @@ function operator_form(&$form, &$form_state) {
/**
* Provide a list of options for the default operator form.
* Should be overridden by classes that don't override operator_form
* Should be overridden by classes that don't override operatorForm
*/
public function operatorOptions() { return array(); }
......@@ -787,7 +787,7 @@ public function buildExposedForm(&$form, &$form_state) {
// Build the exposed form, when its based on an operator.
if (!empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id'])) {
$operator = $this->options['expose']['operator_id'];
$this->operator_form($form, $form_state);
$this->operatorForm($form, $form_state);
$form[$operator] = $form['operator'];
if (isset($form[$operator]['#title'])) {
......@@ -962,7 +962,7 @@ protected function buildExposedFiltersGroupForm(&$form, &$form_state) {
// $row acts as a fake form to render each widget in a row.
$row = array();
$groups[$item_id] = '';
$this->operator_form($row, $form_state);
$this->operatorForm($row, $form_state);
// Force the operator form to be a select box. Some handlers uses
// radios and they occupy a lot of space in a table row.
$row['operator']['#type'] = 'select';
......
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