diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php index 90dc49d3809c2f0b4310cdc61a3bf2970d9c3fdd..9ba103d40aca44819cea3a5892eae9048bdcc467 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/AdvancedSettingsForm.php @@ -97,6 +97,8 @@ public function submitForm(array &$form, array &$form_state) { ->set('no_javascript', $form_state['values']['no_javascript']) ->set('display_extenders', isset($form_state['values']['display_extenders']) ? $form_state['values']['display_extenders'] : array()) ->save(); + + parent::submitForm($form, $form_state); } /** diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php index a44180524dd0e3b9fe2e002f8c9d1e44ba1b2258..f898f9ae8f8555968f95374497a76d6c77d57bf9 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Form/BasicSettingsForm.php @@ -139,6 +139,8 @@ public function submitForm(array &$form, array &$form_state) { ->set('ui.show.performance_statistics', $form_state['values']['ui_show_performance_statistics']) ->set('ui.show.additional_queries', $form_state['values']['ui_show_additional_queries']) ->save(); + + parent::submitForm($form, $form_state); } } diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php index 86029a99918336e1ee6bc533e1371461ff74532a..a4e5f76f06b52f10ef2de2a980b39ca556869520 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/SettingsTest.php @@ -37,6 +37,10 @@ function testEditUI() { $this->drupalGet('admin/structure/views'); $this->assertLinkByHref('admin/structure/views/settings'); + // Test the confirmation message. + $this->drupalPostForm('admin/structure/views/settings', array(), t('Save configuration')); + $this->assertText(t('The configuration options have been saved.')); + // Configure to always show the master display. $edit = array( 'ui_show_master_display' => TRUE, @@ -117,6 +121,27 @@ function testEditUI() { $this->assertEqual(count($xpath), 1, 'The views sql is shown.'); $this->assertFalse(strpos($xpath[0], 'db_condition_placeholder') !== FALSE, 'No placeholders are shown in the views sql.'); $this->assertTrue(strpos($xpath[0], "node_field_data.status = '1'") !== FALSE, 'The placeholders in the views sql is replace by the actual value.'); + + // Test the advanced settings form. + + // Test the confirmation message. + $this->drupalPostForm('admin/structure/views/settings/advanced', array(), t('Save configuration')); + $this->assertText(t('The configuration options have been saved.')); + + $edit = array( + 'skip_cache' => TRUE, + 'sql_signature' => TRUE, + 'no_javascript' => TRUE, + ); + $this->drupalPostForm('admin/structure/views/settings/advanced', $edit, t('Save configuration')); + + $this->assertFieldChecked('edit-skip-cache', 'The skip_cache option is checked.'); + $this->assertFieldChecked('edit-sql-signature', 'The sql_signature option is checked.'); + $this->assertFieldChecked('edit-no-javascript', 'The no_javascript option is checked.'); + + // Test the "Clear Views' cache" button. + $this->drupalPostForm('admin/structure/views/settings/advanced', array(), t("Clear Views' cache")); + $this->assertText(t('The cache has been cleared.')); } }