Issue #2003346 by JimSmith: Rename Views method render_exposed_form() to renderExposedForm().
parent
708e3c9ace
commit
15d26abb0f
|
@ -2704,7 +2704,7 @@ abstract class DisplayPluginBase extends PluginBase {
|
||||||
|
|
||||||
if ($this->usesExposed() && $this->getOption('exposed_block')) {
|
if ($this->usesExposed() && $this->getOption('exposed_block')) {
|
||||||
$exposed_form = $this->getPlugin('exposed_form');
|
$exposed_form = $this->getPlugin('exposed_form');
|
||||||
return $exposed_form->render_exposed_form(TRUE);
|
return $exposed_form->renderExposedForm(TRUE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@ abstract class ExposedFormPluginBase extends PluginBase {
|
||||||
* also assign data to the appropriate handlers for use in building the
|
* also assign data to the appropriate handlers for use in building the
|
||||||
* query.
|
* query.
|
||||||
*/
|
*/
|
||||||
function render_exposed_form($block = FALSE) {
|
public function renderExposedForm($block = FALSE) {
|
||||||
// Deal with any exposed filters we may have, before building.
|
// Deal with any exposed filters we may have, before building.
|
||||||
$form_state = array(
|
$form_state = array(
|
||||||
'view' => &$this->view,
|
'view' => &$this->view,
|
||||||
|
|
|
@ -99,7 +99,7 @@ class ExposedFormTest extends ViewTestBase {
|
||||||
$view = views_get_view('test_reset_button');
|
$view = views_get_view('test_reset_button');
|
||||||
$this->executeView($view);
|
$this->executeView($view);
|
||||||
$exposed_form = $view->display_handler->getPlugin('exposed_form');
|
$exposed_form = $view->display_handler->getPlugin('exposed_form');
|
||||||
$this->drupalSetContent($exposed_form->render_exposed_form());
|
$this->drupalSetContent($exposed_form->renderExposedForm());
|
||||||
|
|
||||||
$expected_id = drupal_clean_css_identifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display);
|
$expected_id = drupal_clean_css_identifier('views-exposed-form-' . $view->storage->id() . '-' . $view->current_display);
|
||||||
$this->assertFieldByXpath('//form/@id', $expected_id, 'Expected form ID found.');
|
$this->assertFieldByXpath('//form/@id', $expected_id, 'Expected form ID found.');
|
||||||
|
|
|
@ -997,7 +997,7 @@ class ViewExecutable {
|
||||||
|
|
||||||
if ($this->display_handler->usesExposed()) {
|
if ($this->display_handler->usesExposed()) {
|
||||||
$exposed_form = $this->display_handler->getPlugin('exposed_form');
|
$exposed_form = $this->display_handler->getPlugin('exposed_form');
|
||||||
$this->exposed_widgets = $exposed_form->render_exposed_form();
|
$this->exposed_widgets = $exposed_form->renderExposedForm();
|
||||||
if (form_set_error() || !empty($this->build_info['abort'])) {
|
if (form_set_error() || !empty($this->build_info['abort'])) {
|
||||||
$this->built = TRUE;
|
$this->built = TRUE;
|
||||||
// Don't execute the query, but rendering will still be executed to display the empty text.
|
// Don't execute the query, but rendering will still be executed to display the empty text.
|
||||||
|
|
Loading…
Reference in New Issue