summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcatch2013-02-06 16:15:31 (GMT)
committercatch2013-02-06 16:15:31 (GMT)
commit8787384e111a45f971e11a4dee5b6fdcb95b2f8f (patch)
tree9fc25f6e8f5a7251f94fa6922c3b1d61396d9442
parent9948cf0be6aee2896163c680e5a150f6e1ee0431 (diff)
Issue #1869124 by Les Lim, damiankloip: Added Customizable 'true'/'false' Views output for booleans.
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php30
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php1
-rw-r--r--core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php114
3 files changed, 142 insertions, 3 deletions
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
index c4f876d..906265a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/Boolean.php
@@ -36,6 +36,8 @@ class Boolean extends FieldPluginBase {
protected function defineOptions() {
$options = parent::defineOptions();
$options['type'] = array('default' => 'yes-no');
+ $options['type_custom_true'] = array('default' => '', 'translatable' => TRUE);
+ $options['type_custom_false'] = array('default' => '', 'translatable' => TRUE);
$options['not'] = array('definition bool' => 'reverse');
return $options;
@@ -56,7 +58,8 @@ class Boolean extends FieldPluginBase {
'unicode-yes-no' => array('✔', '✖'),
);
$output_formats = isset($this->definition['output formats']) ? $this->definition['output formats'] : array();
- $this->formats = array_merge($default_formats, $output_formats);
+ $custom_format = array('custom' => array(t('Custom')));
+ $this->formats = array_merge($default_formats, $output_formats, $custom_format);
}
public function buildOptionsForm(&$form, &$form_state) {
@@ -70,6 +73,26 @@ class Boolean extends FieldPluginBase {
'#options' => $options,
'#default_value' => $this->options['type'],
);
+ $form['type_custom_true'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Custom output for TRUE'),
+ '#default_value' => $this->options['type_custom_true'],
+ '#states' => array(
+ 'visible' => array(
+ 'select[name="options[type]"]' => array('value' => 'custom'),
+ ),
+ ),
+ );
+ $form['type_custom_false'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Custom output for FALSE'),
+ '#default_value' => $this->options['type_custom_false'],
+ '#states' => array(
+ 'visible' => array(
+ 'select[name="options[type]"]' => array('value' => 'custom'),
+ ),
+ ),
+ );
$form['not'] = array(
'#type' => 'checkbox',
'#title' => t('Reverse'),
@@ -85,7 +108,10 @@ class Boolean extends FieldPluginBase {
$value = !$value;
}
- if (isset($this->formats[$this->options['type']])) {
+ if ($this->options['type'] == 'custom') {
+ return $value ? filter_xss_admin($this->options['type_custom_true']) : filter_xss_admin($this->options['type_custom_false']);
+ }
+ elseif (isset($this->formats[$this->options['type']])) {
return $value ? $this->formats[$this->options['type']][0] : $this->formats[$this->options['type']][1];
}
else {
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index 61b2a6d..417e0b5 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -84,7 +84,6 @@ class FieldBooleanTest extends ViewUnitTestBase {
$view->field['age']->options['type'] = 'test';
$this->assertEqual(t('Test-False'), $view->field['age']->advanced_render($view->result[0]));
$this->assertEqual(t('Test-True'), $view->field['age']->advanced_render($view->result[1]));
-
}
}
diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
new file mode 100644
index 0000000..0b2ff19
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Tests/UI/CustomBooleanTest.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\UI\CustomBooleanTest.
+ */
+
+namespace Drupal\views\Tests\UI;
+
+/**
+ * Tests the UI and functionality for the Custom boolean field handler options.
+ *
+ * @see \Drupal\views\Plugin\views\field\Boolean
+ */
+class CustomBooleanTest extends UITestBase {
+
+ /**
+ * Views used by this test.
+ *
+ * @var array
+ */
+ public static $testViews = array('test_view');
+
+ public static function getInfo() {
+ return array(
+ 'name' => 'Boolean custom options: UI',
+ 'description' => 'Tests the UI and functionality for the Custom boolean field handler options',
+ 'group' => 'Views UI',
+ );
+ }
+
+ /**
+ * \Drupal\views\Tests\ViewTestBase::viewsData().
+ */
+ public function viewsData() {
+ $data = parent::viewsData();
+ $data['views_test_data']['age']['field']['id'] = 'boolean';
+ return $data;
+ }
+
+ /**
+ * Overrides \Drupal\views\Tests\ViewTestBase::dataSet().
+ */
+ public function dataSet() {
+ $data = parent::dataSet();
+ $data[0]['age'] = 0;
+ $data[3]['age'] = 0;
+ return $data;
+ }
+
+ /**
+ * Tests the setting and output of custom labels for boolean values.
+ */
+ public function testCustomOption() {
+ // Add the boolean field handler to the test view.
+ $view = views_get_view('test_view');
+ $view->setDisplay();
+
+ $view->displayHandlers->get('default')->overrideOption('fields', array(
+ 'age' => array(
+ 'id' => 'age',
+ 'table' => 'views_test_data',
+ 'field' => 'age',
+ 'relationship' => 'none',
+ ),
+ ));
+
+ $this->executeView($view);
+
+ $custom_true = 'Yay';
+ $custom_false = 'Nay';
+
+ // Set up some custom value mappings for different types.
+ $custom_values = array(
+ 'plain' => array(
+ 'true' => $custom_true,
+ 'false' => $custom_false,
+ 'test' => 'assertTrue',
+ ),
+ 'allowed tag' => array(
+ 'true' => '<p>' . $custom_true . '</p>',
+ 'false' => '<p>' . $custom_false . '</p>',
+ 'test' => 'assertTrue',
+ ),
+ 'disallowed tag' => array(
+ 'true' => '<script>' . $custom_true . '</script>',
+ 'false' => '<script>' . $custom_false . '</script>',
+ 'test' => 'assertFalse',
+ ),
+ );
+
+ // Run the same tests on each type.
+ foreach ($custom_values as $type => $values) {
+ $options = array(
+ 'options[type]' => 'custom',
+ 'options[type_custom_true]' => $values['true'],
+ 'options[type_custom_false]' => $values['false'],
+ );
+ $this->drupalPost('admin/structure/views/nojs/config-item/test_view/default/field/age', $options, 'Apply');
+
+ // Save the view.
+ $this->drupalPost('admin/structure/views/view/test_view', array(), 'Save');
+
+ $view = views_get_view('test_view');
+ $output = $view->preview();
+
+ $replacements = array('%type' => $type);
+ $this->{$values['test']}(strpos($output, $values['true']), format_string('Expected custom boolean TRUE value in output for %type.', $replacements));
+ $this->{$values['test']}(strpos($output, $values['false']), format_string('Expected custom boolean FALSE value in output for %type', $replacements));
+ }
+ }
+
+}
+