From 32f0ea457c8bc166bee94bc5248ea71cfb4ded84 Mon Sep 17 00:00:00 2001 From: Magnar Eivind Martinsen Date: Fri, 8 Sep 2023 15:22:43 +0200 Subject: [PATCH] Fixed missing parent/child filters in main search. Fixed twig error when license text is missing --- .../install/views.view.metsis_elements.yml | 20 ++- .../install/views.view.metsis_search.yml | 129 +++++++++++++++++- 2 files changed, 132 insertions(+), 17 deletions(-) diff --git a/metsis/metsis_search/config/install/views.view.metsis_elements.yml b/metsis/metsis_search/config/install/views.view.metsis_elements.yml index 67d1ea1..6bfdad0 100644 --- a/metsis/metsis_search/config/install/views.view.metsis_elements.yml +++ b/metsis/metsis_search/config/install/views.view.metsis_elements.yml @@ -187,19 +187,19 @@ display: use_highlighting: true multi_type: separator multi_separator: ', ' - thumbnail_data: - id: thumbnail_data - table: search_api_index_metsis - field: thumbnail_data + nothing_11: + id: nothing_11 + table: views + field: nothing relationship: none group_type: group admin_label: Thumbnail - plugin_id: search_api + plugin_id: custom label: '' exclude: false alter: alter_text: true - text: "
\r\n\r\n\"Embedded\r\n
" + text: "
\r\n\r\n
\r\n\r\n
\r\n\r\n
" make_link: false path: '' absolute: false @@ -235,11 +235,7 @@ display: empty: '' hide_empty: false empty_zero: false - hide_alter_empty: true - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' + hide_alter_empty: false project_long_name: id: project_long_name table: search_api_index_metsis @@ -1997,7 +1993,7 @@ display: exclude: false alter: alter_text: true - text: "{% if use_constraint_identifier == 'CC0-1.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY/NLOD' or ss_access == 'CC BY/NLOD' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n/NLOD\r\n{% elseif use_constraint_identifier == 'CC-BY-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'Not provided' %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% elseif use_constraint_identifier %}\r\n {{ use_constraint_identifier }}\r\n{% else %}\r\n{% if use_constraint_license_text %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% endif %}" + text: "{% if use_constraint_identifier == 'CC0-1.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY/NLOD' or ss_access == 'CC BY/NLOD' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n/NLOD\r\n{% elseif use_constraint_identifier == 'CC-BY-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'Not provided' %}\r\n{% if use_constraint_license_text is defined %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% elseif use_constraint_identifier %}\r\n {{ use_constraint_identifier }}\r\n{% else %}\r\n{% if use_constraint_license_text is defined %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% endif %}" make_link: false path: '' absolute: false diff --git a/metsis/metsis_search/config/install/views.view.metsis_search.yml b/metsis/metsis_search/config/install/views.view.metsis_search.yml index ce8d054..8f1d785 100644 --- a/metsis/metsis_search/config/install/views.view.metsis_search.yml +++ b/metsis/metsis_search/config/install/views.view.metsis_search.yml @@ -2371,22 +2371,26 @@ display: remember_roles: authenticated: authenticated anonymous: '0' + content_editor: '0' administrator: '0' min_placeholder: '' max_placeholder: '' placeholder: '' is_grouped: false group_info: - label: '' - description: '' - identifier: '' + label: 'Temporal extent_start date' + description: null + identifier: temporal_extent_start_date optional: true widget: select multiple: false remember: false default_group: All default_group_multiple: { } - group_items: { } + group_items: + 1: { } + 2: { } + 3: { } temporal_extent_end_date: id: temporal_extent_end_date table: search_api_index_metsis @@ -2641,10 +2645,125 @@ display: default_group: All default_group_multiple: { } group_items: { } + is_child: + id: is_child + table: search_api_index_metsis + field: is_child + relationship: none + group_type: group + admin_label: 'Do not show children' + plugin_id: search_api_boolean + operator: '=' + value: '0' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + is_parent_1: + id: is_parent_1 + table: search_api_index_metsis + field: is_parent + relationship: none + group_type: group + admin_label: 'Show parents with children' + plugin_id: search_api_boolean + operator: '=' + value: '1' + group: 2 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + is_parent_2: + id: is_parent_2 + table: search_api_index_metsis + field: is_parent + relationship: none + group_type: group + admin_label: 'Show regular datasets without children' + plugin_id: search_api_boolean + operator: '=' + value: '0' + group: 2 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } filter_groups: operator: AND groups: 1: AND + 2: OR style: type: html_list options: @@ -4887,7 +5006,7 @@ display: exclude: false alter: alter_text: true - text: "{% if use_constraint_identifier == 'CC0-1.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY/NLOD' or ss_access == 'CC BY/NLOD' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n/NLOD\r\n{% elseif use_constraint_identifier == 'CC-BY-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'Not provided' %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% elseif use_constraint_identifier %}\r\n {{ use_constraint_identifier }}\r\n{% else %}\r\n{% if use_constraint_license_text %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% endif %}" + text: "{% if use_constraint_identifier == 'CC0-1.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY/NLOD' or ss_access == 'CC BY/NLOD' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n/NLOD\r\n{% elseif use_constraint_identifier == 'CC-BY-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-SA-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'CC-BY-NC-ND-4.0' %}\r\n{% if use_constraint_resource %}\r\n\r\n{% else %}\r\n\r\n{% endif %}\r\n\r\n{% elseif use_constraint_identifier == 'Not provided' %}\r\n{% if use_constraint_license_text is defined %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% elseif use_constraint_identifier %}\r\n {{ use_constraint_identifier }}\r\n{% else %}\r\n{% if use_constraint_license_text is defined %}\r\n{{ use_constraint_license_text | preg_replace('/(http[s]?:\\\\/\\\\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\\(\\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+[^\"!\\). ])/', '$1') | raw }}\r\n{% endif %}\r\n{% endif %}" make_link: false path: '' absolute: false