diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index 10fc04a..0529d39 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -877,7 +877,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) { // Default text. $output = []; - $output[][ '#markup'] = '
' . $this->t('You must add some additional fields to this display before using this field. These fields may be marked as Exclude from display if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.') . '
'; + $output[]['#markup'] = '' . $this->t('You must add some additional fields to this display before using this field. These fields may be marked as Exclude from display if you prefer. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.') . '
'; // We have some options, so make a list. if (!empty($options)) { $output[]['#markup'] = '' . $this->t("The following replacement tokens are available for this field. Note that due to rendering order, you cannot use fields that come after this field; if you need a field not listed here, rearrange your fields.") . '
'; diff --git a/core/modules/views_ui/src/Tests/UITestBase.php b/core/modules/views_ui/src/Tests/UITestBase.php index 1fe0cec..a34a610 100644 --- a/core/modules/views_ui/src/Tests/UITestBase.php +++ b/core/modules/views_ui/src/Tests/UITestBase.php @@ -74,4 +74,21 @@ public function randomView(array $view = array()) { return $default; } + /** + * {@inheritdoc} + */ + protected function drupalGet($path, array $options = array(), array $headers = array()) { + $url = $this->buildUrl($path, $options); + + // Ensure that each nojs page is accessible via ajax as well. + if (empty($options['no_ajax_check']) && strpos($url, 'nojs') !== FALSE) { + $url = str_replace('nojs', 'ajax', $url); + $this->drupalGet($url, $options, $headers); + $this->assertResponse(200); + } + + return parent::drupalGet($path, $options, $headers); + } + + }