diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt index 757f0833b83c6c59fade729a97cf405253f55baa..2be6310a2544bf09b56db2f5b3f3fe2df0ba1b08 100644 --- a/profiles/wcm_base/CHANGELOG.txt +++ b/profiles/wcm_base/CHANGELOG.txt @@ -1,3 +1,7 @@ +WCM Base 7.x-1.12-rc2, 2019-02-28 +--------------------------------- +- OCIO News: Reset default filter overrides for news view. + WCM Base 7.x-1.12-rc1, 2019-02-27 --------------------------------- - WCM Base: Updated Context to 3.10 per SA-CONTRIB-2019-028. diff --git a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc index d3ba6c07a76967461c48a8c1441a6ed7d0439ca9..00fb387af529b32ef086f2e70188139f02778465 100644 --- a/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc +++ b/profiles/wcm_base/modules/custom/ocio_news/ocio_news.views_default.inc @@ -76,36 +76,6 @@ function ocio_news_views_default_views() { $handler->display->display_options['filters']['type']['value'] = array( 'article' => 'article', ); - /* Filter criterion: Content: Display in View Panes (field_display_in_view_panes) */ - $handler->display->display_options['filters']['field_display_in_view_panes_value']['id'] = 'field_display_in_view_panes_value'; - $handler->display->display_options['filters']['field_display_in_view_panes_value']['table'] = 'field_data_field_display_in_view_panes'; - $handler->display->display_options['filters']['field_display_in_view_panes_value']['field'] = 'field_display_in_view_panes_value'; - $handler->display->display_options['filters']['field_display_in_view_panes_value']['value'] = array( - 1 => '1', - ); - /* Filter criterion: Content: Tags (field_tags) */ - $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid'; - $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags'; - $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid'; - $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE; - $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op'; - $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags'; - $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op'; - $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'tag'; - $handler->display->display_options['filters']['field_tags_tid']['expose']['multiple'] = TRUE; - $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array( - 2 => '2', - 1 => 0, - 6 => 0, - 5 => 0, - 4 => 0, - 7 => 0, - 8 => 0, - 3 => 0, - ); - $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE; - $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select'; - $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'ocio_tags'; /* Display: News Archive Page */ $handler = $view->new_display('page', 'News Archive Page', 'page'); @@ -265,6 +235,52 @@ function ocio_news_views_default_views() { $handler->display->display_options['defaults']['row_plugin'] = FALSE; $handler->display->display_options['row_plugin'] = 'fields'; $handler->display->display_options['defaults']['row_options'] = FALSE; + $handler->display->display_options['defaults']['filter_groups'] = FALSE; + $handler->display->display_options['defaults']['filters'] = FALSE; + /* Filter criterion: Content: Published */ + $handler->display->display_options['filters']['status']['id'] = 'status'; + $handler->display->display_options['filters']['status']['table'] = 'node'; + $handler->display->display_options['filters']['status']['field'] = 'status'; + $handler->display->display_options['filters']['status']['value'] = 1; + $handler->display->display_options['filters']['status']['group'] = 1; + $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; + /* Filter criterion: Content: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'node'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'article' => 'article', + ); + /* Filter criterion: Content: Display in View Panes (field_display_in_view_panes) */ + $handler->display->display_options['filters']['field_display_in_view_panes_value']['id'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['table'] = 'field_data_field_display_in_view_panes'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['field'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['value'] = array( + 1 => '1', + ); + /* Filter criterion: Content: Tags (field_tags) */ + $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags'; + $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'tag'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['multiple'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array( + 2 => '2', + 1 => 0, + 6 => 0, + 5 => 0, + 4 => 0, + 7 => 0, + 8 => 0, + 3 => 0, + ); + $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select'; + $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'ocio_tags'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 0; @@ -358,6 +374,52 @@ function ocio_news_views_default_views() { ), 'trim_preserve_tags' => '<p> <a> <br>', ); + $handler->display->display_options['defaults']['filter_groups'] = FALSE; + $handler->display->display_options['defaults']['filters'] = FALSE; + /* Filter criterion: Content: Published */ + $handler->display->display_options['filters']['status']['id'] = 'status'; + $handler->display->display_options['filters']['status']['table'] = 'node'; + $handler->display->display_options['filters']['status']['field'] = 'status'; + $handler->display->display_options['filters']['status']['value'] = 1; + $handler->display->display_options['filters']['status']['group'] = 1; + $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; + /* Filter criterion: Content: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'node'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'article' => 'article', + ); + /* Filter criterion: Content: Display in View Panes (field_display_in_view_panes) */ + $handler->display->display_options['filters']['field_display_in_view_panes_value']['id'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['table'] = 'field_data_field_display_in_view_panes'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['field'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['value'] = array( + 1 => '1', + ); + /* Filter criterion: Content: Tags (field_tags) */ + $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags'; + $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'tag'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['multiple'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array( + 2 => '2', + 1 => 0, + 6 => 0, + 5 => 0, + 4 => 0, + 7 => 0, + 8 => 0, + 3 => 0, + ); + $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select'; + $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'ocio_tags'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 0; @@ -445,6 +507,52 @@ function ocio_news_views_default_views() { ), 'trim_preserve_tags' => '<p> <a> <br>', ); + $handler->display->display_options['defaults']['filter_groups'] = FALSE; + $handler->display->display_options['defaults']['filters'] = FALSE; + /* Filter criterion: Content: Published */ + $handler->display->display_options['filters']['status']['id'] = 'status'; + $handler->display->display_options['filters']['status']['table'] = 'node'; + $handler->display->display_options['filters']['status']['field'] = 'status'; + $handler->display->display_options['filters']['status']['value'] = 1; + $handler->display->display_options['filters']['status']['group'] = 1; + $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE; + /* Filter criterion: Content: Type */ + $handler->display->display_options['filters']['type']['id'] = 'type'; + $handler->display->display_options['filters']['type']['table'] = 'node'; + $handler->display->display_options['filters']['type']['field'] = 'type'; + $handler->display->display_options['filters']['type']['value'] = array( + 'article' => 'article', + ); + /* Filter criterion: Content: Display in View Panes (field_display_in_view_panes) */ + $handler->display->display_options['filters']['field_display_in_view_panes_value']['id'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['table'] = 'field_data_field_display_in_view_panes'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['field'] = 'field_display_in_view_panes_value'; + $handler->display->display_options['filters']['field_display_in_view_panes_value']['value'] = array( + 1 => '1', + ); + /* Filter criterion: Content: Tags (field_tags) */ + $handler->display->display_options['filters']['field_tags_tid']['id'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['table'] = 'field_data_field_tags'; + $handler->display->display_options['filters']['field_tags_tid']['field'] = 'field_tags_tid'; + $handler->display->display_options['filters']['field_tags_tid']['exposed'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator_id'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['label'] = 'Tags'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['operator'] = 'field_tags_tid_op'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['identifier'] = 'tag'; + $handler->display->display_options['filters']['field_tags_tid']['expose']['multiple'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['expose']['remember_roles'] = array( + 2 => '2', + 1 => 0, + 6 => 0, + 5 => 0, + 4 => 0, + 7 => 0, + 8 => 0, + 3 => 0, + ); + $handler->display->display_options['filters']['field_tags_tid']['reduce_duplicates'] = TRUE; + $handler->display->display_options['filters']['field_tags_tid']['type'] = 'select'; + $handler->display->display_options['filters']['field_tags_tid']['vocabulary'] = 'ocio_tags'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 'use_pager';