From e88f22a232c86672d3f6ef13e7df953e533069af Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Sat, 3 May 2014 23:15:17 -0700
Subject: [PATCH] Issue #2254765 by damiankloip: No confirmation messages when
Views UI settings forms are saved.
---
.../views_ui/Form/AdvancedSettingsForm.php | 2 ++
.../views_ui/Form/BasicSettingsForm.php | 2 ++
.../Drupal/views_ui/Tests/SettingsTest.php | 25 +++++++++++++++++++
3 files changed, 29 insertions(+)
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 90dc49d3809c..9ba103d40aca 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 a44180524dd0..f898f9ae8f85 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 86029a999183..a4e5f76f06b5 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.'));
}
}
--
GitLab