Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "git commit -m Issue" 

This reverts commit c024e97b49.
8.0.x
Nathaniel Catchpole 2014-05-13 14:53:03 +01:00
parent 7c3e637cce
commit f1c278e8f4
2 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/views/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
View File

@ -83,7 +83,7 @@ class InputRequired extends ExposedFormPluginBase {
'format' => $this->options['text_input_required_format'],
);
$handler = Views::handlerManager('area')->getHandler($options);
$handler->init($this->view, $this->displayHandler, $options);
$handler->init($this->view, $options);
$this->displayHandler->handlers['empty'] = array(
'area' => $handler,
);

26
core/modules/views/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
View File

@ -45,7 +45,7 @@ class ExposedFormTest extends ViewTestBase {
// Create some random nodes.
for ($i = 0; $i < 5; $i++) {
$this->drupalCreateNode(array('type' => 'article'));
$this->drupalCreateNode();
}
}
@ -161,30 +161,6 @@ class ExposedFormTest extends ViewTestBase {
$this->assertEqual(count($elements), 1, 'One exposed form block found.');
}
/**
* Test the input required exposed form type.
*/
public function testInputRequired() {
$view = entity_load('view', 'test_exposed_form_buttons');
$display = &$view->getDisplay('default');
$display['display_options']['exposed_form']['type'] = 'input_required';
$view->save();
$this->drupalGet('test_exposed_form_buttons');
$this->assertResponse(200);
$this->helperButtonHasLabel('edit-submit-test-exposed-form-buttons', t('Apply'));
// Ensure that no results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
$this->assertEqual(count($rows), 0, 'No rows are displayed by default when no input is provided.');
$this->drupalGet('test_exposed_form_buttons', array('query' => array('type' => 'article')));
// Ensure that results are displayed.
$rows = $this->xpath("//div[contains(@class, 'views-row')]");
$this->assertEqual(count($rows), 5, 'All rows are displayed by default when input is provided.');
}
/**
* Returns a views exposed form ID.
*