From 28bdcca2fd6da8afbd98afb2830a81c4f63305ac Mon Sep 17 00:00:00 2001
From: dereine <dereine@99340.no-reply.drupal.org>
Date: Sun, 23 Sep 2012 20:53:29 +0200
Subject: [PATCH] Issue #1790320 by dawehner: Let
views_field_rewrite_elements() use config().
---
config/views.settings.yml | 12 +++++++++++
.../Plugin/views/field/FieldPluginBase.php | 20 +++++--------------
lib/Drupal/views/Tests/Handler/FieldTest.php | 2 ++
tests/views_test_data/views_test_data.install | 8 +++-----
4 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/config/views.settings.yml b/config/views.settings.yml
index b655c401740c..4b9c81c5d650 100644
--- a/config/views.settings.yml
+++ b/config/views.settings.yml
@@ -21,3 +21,15 @@ ui:
always_live_preview: '1'
always_live_preview_button: '1'
exposed_filter_any_label: 'new_any'
+field_rewrite_elements:
+ div: DIV
+ span: SPAN
+ h1: H1
+ h2: H2
+ h3: H3
+ h4: H4
+ h5: H5
+ h6: H6
+ p: P
+ strong: STRONG
+ em: EM
diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 706f4135de59..2a44c9d71693 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -270,21 +270,11 @@ function get_elements() {
static $elements = NULL;
if (!isset($elements)) {
// @todo Add possible html5 elements.
- $elements = variable_get('views_field_rewrite_elements', array(
- '' => t('- Use default -'),
- '0' => t('- None -'),
- 'div' => 'DIV',
- 'span' => 'SPAN',
- 'h1' => 'H1',
- 'h2' => 'H2',
- 'h3' => 'H3',
- 'h4' => 'H4',
- 'h5' => 'H5',
- 'h6' => 'H6',
- 'p' => 'P',
- 'strong' => 'STRONG',
- 'em' => 'EM',
- ));
+ $elements = array(
+ '' => t(' - Use default -'),
+ '0' => t('- None -')
+ );
+ $elements += config('views.settings')->get('field_rewrite_elements');
}
return $elements;
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index 80f31b3b11ff..147e9f177d64 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -476,6 +476,8 @@ public function testFieldClasses() {
'em',
'marquee'
);
+ sort($expected_elements);
+
$this->assertEqual(array_keys($element_types), $expected_elements);
}
diff --git a/tests/views_test_data/views_test_data.install b/tests/views_test_data/views_test_data.install
index 9ad4cad431e5..bb1353131ad4 100644
--- a/tests/views_test_data/views_test_data.install
+++ b/tests/views_test_data/views_test_data.install
@@ -17,9 +17,7 @@ function views_test_data_schema() {
*/
function views_test_data_install() {
// Add the marquee tag to possible html elements to test the field handler.
- $default_values = array(
- '' => t('- Use default -'),
- '0' => t('- None -'),
+ $values = array(
'div' => 'DIV',
'span' => 'SPAN',
'h1' => 'H1',
@@ -31,7 +29,7 @@ function views_test_data_install() {
'p' => 'P',
'strong' => 'STRONG',
'em' => 'EM',
+ 'marquee' => 'MARQUEE'
);
- $default_values['marquee'] = 'MARQUEE';
- variable_set('views_field_rewrite_elements', $default_values);
+ config('views.settings')->set('field_rewrite_elements', $values)->save();
}
--
GitLab