Commit 668fcb8c authored by Marika's avatar Marika Committed by David Bätge
Browse files

Issue #3254305 by mlahde: Undefined index in case of Views Conditional

parent 667bf612

flexible_views.theme.inc

+4 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ function template_preprocess_views_view_flexible_table(array &$variables) { 
    // Add the columns which are always visible.

    $columns_reverse = array_reverse($columns, TRUE);

    foreach ($columns_reverse as $index => $column) {

      if (!in_array($column, $column_order) && $options['info'][$column]['default_visible']) {

      if (!in_array($column, $column_order) && isset($options['info'][$column]) && $options['info'][$column]['default_visible']) {

        $original_position = $fields[$column]->position;



        if ($original_position >= count($column_order)) {
@@ -220,7 +220,9 @@ function template_preprocess_views_view_flexible_table(array &$variables) { 


    $field_flexible_logic_is_visible = isset($column_settings) ?

      in_array($field, Json::decode($column_settings)) || $always_visible :

      $options['info'][$field]['default_visible'] || $always_visible;

      (isset($options['info'][$field]) ?

        $options['info'][$field]['default_visible'] || $always_visible :

        $always_visible);



    // Render the header labels.

    if ($field == $column && empty($fields[$field]->options['exclude']) && $field_flexible_logic_is_visible) {

src/Plugin/views/filter/ColumnSelector.php

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class ColumnSelector extends FilterPluginBase { 
          $options[$field_name] = $field_info->options['label'];

        }

        // Defaults.

        if ($fields[$field_name]['default_visible']) {

        if (isset($fields[$field_name]['default_visible']) && $fields[$field_name]['default_visible']) {

          $options_default_visible[$field_name] = $field_info->options['label'];

        }

      }