diff --git a/composer.json b/composer.json index 2e68cf0c..1885167e 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "composer/installers": "^1.9", "drupal/address": "1.x-dev@dev", "drupal/administerusersbyrole": "3.x-dev@dev", + "drupal/better_exposed_filters": "^5.0@beta", "drupal/config_ignore": "^2.3", "drupal/core-composer-scaffold": "^9.1", "drupal/core-project-message": "^9.1", @@ -36,6 +37,7 @@ "drupal/panels": "^4.6", "drupal/paragraphs": "1.x-dev@dev", "drupal/role_delegation": "^1.1", + "drupal/selective_better_exposed_filters": "2.x-dev@dev", "drupal/smart_date": "^3.1", "geocoder-php/google-maps-provider": "^4.6", "geocoder-php/mapquest-provider": "^4.2", @@ -118,7 +120,8 @@ "jQuery UI Touch Punch library https://www.drupal.org/project/jquery_ui_touch_punch/issues/3159222":"https://www.drupal.org/files/issues/2021-02-26/jquery_ui_touch_punch.patch" }, "drupal/core": { - "Call to a member function getSetting() on null migrate_drupal https://www.drupal.org/project/drupal/issues/2984460": "https://www.drupal.org/files/issues/2020-04-06/2984460-3.patch" + "Call to a member function getSetting() on null migrate_drupal https://www.drupal.org/project/drupal/issues/2984460": "https://www.drupal.org/files/issues/2020-04-06/2984460-3.patch", + "Add Views EntityReference filter to be available for all entity reference fields https://www.drupal.org/project/drupal/issues/2429699" : "https://www.drupal.org/files/issues/2021-03-06/2429699-389.patch" } } } diff --git a/composer.lock b/composer.lock index 0e32cd1a..edf144ce 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "966a685486a1411a2bee1eb79d507edd", + "content-hash": "00103744016446a4cd0a385311488d9d", "packages": [ { "name": "alchemy/zippy", @@ -8465,6 +8465,52 @@ "source": "https://git.drupalcode.org/project/search_api" } }, + { + "name": "drupal/selective_better_exposed_filters", + "version": "dev-2.x", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/selective_better_exposed_filters.git", + "reference": "16891b0b244495b0a61ebcd7d9786c875d62d90d" + }, + "require": { + "drupal/better_exposed_filters": "^4.0 || ^5.0", + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + }, + "drupal": { + "version": "8.x-2.0-beta5+1-dev", + "datestamp": "1595929101", + "security-coverage": { + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "stomusic", + "homepage": "https://www.drupal.org/user/3405436" + } + ], + "description": "Provide extra option for better exposed filters to show only used terms in filter.", + "homepage": "https://www.drupal.org/project/selective_better_exposed_filters", + "keywords": [ + "Drupal" + ], + "support": { + "source": "http://cgit.drupalcode.org/selective_better_exposed_filters", + "issues": "https://www.drupal.org/project/issues/selective_better_exposed_filters" + } + }, { "name": "drupal/smart_date", "version": "3.1.2", @@ -15181,12 +15227,13 @@ "stability-flags": { "drupal/address": 20, "drupal/administerusersbyrole": 20, + "drupal/better_exposed_filters": 10, "drupal/migrate_devel": 20, "drupal/migrate_tools": 20, "drupal/page_manager": 20, "drupal/paragraphs": 20, + "drupal/selective_better_exposed_filters": 20, "drupal/autocomplete_deluxe": 5, - "drupal/better_exposed_filters": 10, "drupal/bulkdelete": 20, "drupal/cshs": 20, "drupal/config_ignore": 5, diff --git a/config/sync/block.block.head.yml b/config/sync/block.block.head.yml new file mode 100644 index 00000000..759ae610 --- /dev/null +++ b/config/sync/block.block.head.yml @@ -0,0 +1,40 @@ +uuid: 6eac2aee-ee11-439c-9c6b-62058216adb7 +langcode: fr +status: true +dependencies: + config: + - system.menu.head + module: + - context + - menu_block + theme: + - popsu +id: head +theme: popsu +region: header_top_rigth +weight: 0 +provider: null +plugin: 'menu_block:head' +settings: + id: 'menu_block:head' + label: Head + provider: menu_block + label_display: '0' + follow: false + follow_parent: child + level: 1 + depth: 0 + expand_all_items: false + parent: 'head:' + suggestion: head + label_type: block + label_link: false +visibility: + view_inclusion: + id: view_inclusion + negate: null + view_inclusion: { } + request_path_exclusion: + id: request_path_exclusion + pages: '' + negate: null diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index d1d2821a..c91ea9f6 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -139,6 +139,7 @@ module: filefield_sources: 1 menu_admin_per_menu: 1 pathauto: 1 + selective_better_exposed_filters: 1 content_translation: 10 views: 10 paragraphs: 11 diff --git a/config/sync/system.menu.head.yml b/config/sync/system.menu.head.yml new file mode 100644 index 00000000..388ccc40 --- /dev/null +++ b/config/sync/system.menu.head.yml @@ -0,0 +1,8 @@ +uuid: d0f9c7cb-a4b1-4186-91af-47beb857276a +langcode: fr +status: true +dependencies: { } +id: head +label: Head +description: '' +locked: false diff --git a/config/sync/views.view.centre_de_ressources.yml b/config/sync/views.view.centre_de_ressources.yml new file mode 100644 index 00000000..4f9cdc50 --- /dev/null +++ b/config/sync/views.view.centre_de_ressources.yml @@ -0,0 +1,833 @@ +uuid: 249b75ef-1b45-49b9-97d0-36af8dbad08a +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_image + - field.storage.node.field_programme + - field.storage.node.field_sous_titre + - field.storage.node.field_theme + - field.storage.node.field_type_de_ressource + - image.style.medium + - node.type.ressource + - system.menu.head + - taxonomy.vocabulary.types_de_document + - taxonomy.vocabulary.villes + module: + - better_exposed_filters + - image + - node + - taxonomy + - user +id: centre_de_ressources +label: 'Centre de ressources' +module: views +description: '' +tag: '' +base_table: node_field_data +base_field: nid +display: + default: + display_plugin: default + id: default + display_title: Master + position: 0 + display_options: + access: + type: perm + options: + perm: 'access content' + cache: + type: tag + options: { } + query: + type: views_query + options: + disable_sql_rewrite: false + distinct: false + replica: false + query_comment: '' + query_tags: { } + exposed_form: + type: bef + options: + submit_button: Apply + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + text_input_required: 'Sélectionnez n''importe quel filtre et cliquez sur Appliquer pour voir les résultats' + text_input_required_format: wysiwyg + bef: + general: + autosubmit: false + autosubmit_exclude_textfield: false + autosubmit_textfield_delay: 500 + autosubmit_hide: false + input_required: false + allow_secondary: false + secondary_label: 'Options avancées' + secondary_open: false + filter: + field_programme_target_id: + plugin_id: default + advanced: + collapsible: false + is_secondary: false + options_show_only_used: false + options_show_only_used_filtered: false + pager: + type: mini + options: + items_per_page: 25 + offset: 0 + id: 0 + total_pages: null + tags: + previous: ‹‹ + next: ›› + expose: + items_per_page: true + items_per_page_label: 'Items per page' + items_per_page_options: '5, 10, 25, 50' + items_per_page_options_all: true + items_per_page_options_all_label: '- All -' + offset: false + offset_label: Offset + style: + type: grid + row: + type: fields + fields: + field_programme: + id: field_programme + table: node__field_programme + field: field_programme + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + plugin_id: field + field_type_de_ressource: + id: field_type_de_ressource + table: node__field_type_de_ressource + field: field_type_de_ressource + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + plugin_id: field + title: + id: title + table: node_field_data + field: title + entity_type: node + entity_field: title + label: '' + alter: + alter_text: false + make_link: false + absolute: false + trim: false + word_boundary: false + ellipsis: false + strip_tags: false + html: false + hide_empty: false + empty_zero: false + settings: + link_to_entity: true + plugin_id: field + relationship: none + group_type: group + admin_label: '' + exclude: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_alter_empty: true + click_sort_column: value + type: string + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + field_sous_titre: + id: field_sous_titre + table: node__field_sous_titre + field: field_sous_titre + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + plugin_id: field + field_image: + id: field_image + table: node__field_image + field: field_image + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: image + settings: + image_style: medium + image_link: file + group_column: '' + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + plugin_id: field + field_theme: + id: field_theme + table: node__field_theme + field: field_theme + relationship: none + group_type: group + admin_label: '' + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: true + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + plugin_id: field + filters: + status: + value: '1' + table: node_field_data + field: status + plugin_id: boolean + entity_type: node + entity_field: status + id: status + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + group: 1 + type: + id: type + table: node_field_data + field: type + value: + ressource: ressource + entity_type: node + entity_field: type + plugin_id: bundle + expose: + operator_limit_selection: false + operator_list: { } + field_programme_target_id: + id: field_programme_target_id + table: node__field_programme + field: field_programme_target_id + relationship: none + group_type: group + admin_label: '' + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_programme_target_id_op + label: Programme + description: '' + use_operator: false + operator: field_programme_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: programme + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + admin: '0' + root: '0' + user: '0' + editeur: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + handler: 'default:node' + handler_settings: + target_bundles: + programme: programme + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' + widget: select + plugin_id: entity_reference + field_theme_target_id: + id: field_theme_target_id + table: node__field_theme + field: field_theme_target_id + relationship: none + group_type: group + admin_label: '' + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_theme_target_id_op + label: Thème + description: '' + use_operator: false + operator: field_theme_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: theme + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + admin: '0' + root: '0' + user: '0' + editeur: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + handler: 'default:node' + handler_settings: + target_bundles: + theme: theme + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' + widget: select + plugin_id: entity_reference + field_ville_target_id: + id: field_ville_target_id + table: node__field_ville + field: field_ville_target_id + relationship: none + group_type: group + admin_label: '' + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_ville_target_id_op + label: Ville + description: '' + use_operator: false + operator: field_ville_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: ville + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + admin: '0' + root: '0' + user: '0' + editeur: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + type: select + limit: true + vid: villes + hierarchy: false + error_message: true + parent: 0 + level_labels: '' + force_deepest: false + save_lineage: false + hierarchy_depth: 0 + required_depth: 0 + plugin_id: taxonomy_index_tid + field_type_de_ressource_target_id: + id: field_type_de_ressource_target_id + table: node__field_type_de_ressource + field: field_type_de_ressource_target_id + relationship: none + group_type: group + admin_label: '' + operator: or + value: { } + group: 1 + exposed: true + expose: + operator_id: field_type_de_ressource_target_id_op + label: 'Type de ressource' + description: '' + use_operator: false + operator: field_type_de_ressource_target_id_op + operator_limit_selection: false + operator_list: { } + identifier: type + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + admin: '0' + root: '0' + user: '0' + editeur: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + reduce_duplicates: false + type: select + limit: true + vid: types_de_document + hierarchy: false + error_message: true + parent: 0 + level_labels: '' + force_deepest: false + save_lineage: false + hierarchy_depth: 0 + required_depth: 0 + plugin_id: taxonomy_index_tid + sorts: + created: + id: created + table: node_field_data + field: created + order: DESC + entity_type: node + entity_field: created + plugin_id: date + relationship: none + group_type: group + admin_label: '' + exposed: false + expose: + label: '' + granularity: second + title: 'Centre de ressources' + header: { } + footer: { } + empty: { } + relationships: { } + arguments: { } + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - 'user.node_grants:view' + - user.permissions + tags: + - 'config:field.storage.node.field_image' + - 'config:field.storage.node.field_programme' + - 'config:field.storage.node.field_sous_titre' + - 'config:field.storage.node.field_theme' + - 'config:field.storage.node.field_type_de_ressource' + page_1: + display_plugin: page + id: page_1 + display_title: Page + position: 1 + display_options: + display_extenders: + views_ef_fieldset: + views_ef_fieldset: + enabled: 0 + options: + sort: + root: + container_type: details + title: Filtres + description: '' + open: '1' + weight: '0' + id: root + pid: '' + depth: '0' + type: container + field_programme_target_id: + weight: '-4' + id: field_programme_target_id + pid: root + depth: '1' + type: filter + submit: + weight: '-4' + id: submit + pid: root + depth: '1' + type: buttons + container-0: + container_type: details + title: 'Container 0' + description: '' + weight: '-3' + open: 0 + id: container-0 + pid: root + depth: '1' + type: container + container-1: + container_type: details + title: 'Container 1' + description: '' + weight: '-2' + open: 0 + id: container-1 + pid: root + depth: '1' + type: container + path: centre-de-ressources + menu: + type: normal + title: 'Centre de ressources' + description: '' + expanded: false + parent: '' + weight: 0 + context: '0' + menu_name: head + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - 'user.node_grants:view' + - user.permissions + tags: + - 'config:field.storage.node.field_image' + - 'config:field.storage.node.field_programme' + - 'config:field.storage.node.field_sous_titre' + - 'config:field.storage.node.field_theme' + - 'config:field.storage.node.field_type_de_ressource' diff --git a/web/sites/development.services.yml b/web/sites/development.services.yml index 219b7ce1..d2857c66 100644 --- a/web/sites/development.services.yml +++ b/web/sites/development.services.yml @@ -4,10 +4,6 @@ # 'example.settings.local.php' file, which sits next to this file. parameters: http.response.debug_cacheability_headers: true - twig.config: - debug: true - cache: false - auto_reload: true services: cache.backend.null: class: Drupal\Core\Cache\NullBackendFactory