diff --git a/modules/field/views_handler_filter_field_list.inc b/modules/field/views_handler_filter_field_list.inc index 440d55b..ed23518 100644 --- a/modules/field/views_handler_filter_field_list.inc +++ b/modules/field/views_handler_filter_field_list.inc @@ -14,6 +14,7 @@ class views_handler_filter_field_list extends views_handler_filter_many_to_one { function init(&$view, &$options) { parent::init($view, $options); + // Migrate the settings from the old filter_in_operator values to filter_many_to_one. if ($this->options['operator'] == 'in') { $this->options['operator'] = 'or'; @@ -24,9 +25,9 @@ class views_handler_filter_field_list extends views_handler_filter_many_to_one { $this->operator = $this->options['operator']; } - function get_value_options() { $field = field_info_field($this->definition['field_name']); $this->value_options = list_allowed_values($field); } + } diff --git a/tests/field/views_filter_list.test b/tests/field/views_filter_list.test index 63871cc..16adf38 100644 --- a/tests/field/views_filter_list.test +++ b/tests/field/views_filter_list.test @@ -2,7 +2,7 @@ /** * @file - * Definition of viewsHandlerArgumentCommentUserUidTest. + * Definition of ViewsHandlerFilterFieldListTest. */ /** @@ -10,8 +10,7 @@ * * @see views_handler_filter_field_list */ - -class viewsHandlerFilterFieldListTest extends ViewsSqlTest { +class ViewsHandlerFilterFieldListTest extends ViewsSqlTest { /** * Stores the field definition used by the test. @@ -26,6 +25,7 @@ class viewsHandlerFilterFieldListTest extends ViewsSqlTest { * @var array */ protected $instance; + public $nodes; public static function getInfo() { @@ -36,8 +36,9 @@ class viewsHandlerFilterFieldListTest extends ViewsSqlTest { ); } - protected function setUp() { + function setUp() { parent::setUp(); + $field = array( 'field_name' => 'field_list', 'type' => 'list_integer', @@ -67,7 +68,6 @@ class viewsHandlerFilterFieldListTest extends ViewsSqlTest { } } - /** * Tests the filtering on operators for the handler. */ @@ -148,7 +148,7 @@ class viewsHandlerFilterFieldListTest extends ViewsSqlTest { } protected function viewTestOperators() { - $view = new view; + $view = new view(); $view->name = 'view_fieldapi'; $view->description = ''; $view->tag = 'default'; @@ -181,5 +181,5 @@ class viewsHandlerFilterFieldListTest extends ViewsSqlTest { return $view; } -} +}