From 00250f57e347db1687beae4c54309e5a16a1a01c Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 10 Mar 2025 19:45:32 +0100 Subject: [PATCH] updates --- composer.json | 2 +- composer.lock | 89 +++++++++++++++---- config/sync/block_class.settings.yml | 2 + config/sync/core.extension.yml | 1 + config/sync/user.role.admin.yml | 2 + config/sync/user.role.editeur.yml | 2 + .../sync/views.view.centre_de_ressources.yml | 11 +++ config/sync/views.view.files.yml | 53 +++++++++++ web/profiles/d8-starterkit-profile | 2 +- 9 files changed, 146 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 96ba2888..21e7faa4 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,6 @@ "drupal/advanced_text_formatter": "^3.0@RC", "drupal/better_exposed_filters": "^6", "drupal/betterlogin": "^2.0", - "drupal/block_class": "^2.0", "drupal/ckeditor_iframe": "^3.0@alpha", "drupal/config_ignore": "^3.2", "drupal/config_update": "^2.0@alpha", @@ -30,6 +29,7 @@ "drupal/core-project-message": "^9.3", "drupal/core-recommended": "^9.5.11", "drupal/devel": "^5.0", + "drupal/file_delete": "^2.0", "drupal/file_replace": "^1.4", "drupal/geocoder": "^3.20 || ^4.0", "drupal/geofield": "^1.22", diff --git a/composer.lock b/composer.lock index de459d61..045d29d2 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": "639bcac0824cd2a803b22d6c8025a136", + "content-hash": "39d88de278889ce111565e14f95d6f51", "packages": [ { "name": "ajgl/breakpoint-twig-extension", @@ -2843,26 +2843,26 @@ }, { "name": "drupal/block_class", - "version": "2.0.11", + "version": "4.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/block_class.git", - "reference": "2.0.11" + "reference": "4.0.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/block_class-2.0.11.zip", - "reference": "2.0.11", - "shasum": "bd098ef0071b5baca1248c0deaa9bbedc0ddcaf4" + "url": "https://ftp.drupal.org/files/projects/block_class-4.0.0.zip", + "reference": "4.0.0", + "shasum": "4ed97a78db9b52f28e46d377947fecfb3a8c9580" }, "require": { - "drupal/core": "^8 || ^9 || ^10" + "drupal/core": "^9 || ^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.11", - "datestamp": "1672065313", + "version": "4.0.0", + "datestamp": "1730640283", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4317,17 +4317,17 @@ }, { "name": "drupal/ctools", - "version": "3.14.0", + "version": "3.15.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ctools.git", - "reference": "8.x-3.14" + "reference": "8.x-3.15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.14.zip", - "reference": "8.x-3.14", - "shasum": "8895a8e47199b458013bc153ceafa0b1495f33c1" + "url": "https://ftp.drupal.org/files/projects/ctools-8.x-3.15.zip", + "reference": "8.x-3.15", + "shasum": "84e360763162bf97dfb99a21a65580e7ea504bc6" }, "require": { "drupal/core": "^9.3 || ^10" @@ -4335,8 +4335,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.14", - "datestamp": "1684299793", + "version": "8.x-3.15", + "datestamp": "1718145169", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5496,6 +5496,63 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, + { + "name": "drupal/file_delete", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/file_delete.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/file_delete-2.0.0.zip", + "reference": "2.0.0", + "shasum": "39933b698ed2f6500f1d94a681172b2c4cc94feb" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "require-dev": { + "drupal/coder": "^8.3" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1664902819", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Jonathan Eom", + "homepage": "https://www.drupal.org/user/3458427", + "email": "jonnyeom@gmail.com" + }, + { + "name": "smustgrave", + "homepage": "https://www.drupal.org/user/3252890" + } + ], + "description": "Provides the ability to easily delete files within Drupal administration.", + "homepage": "https://www.drupal.org/project/file_delete", + "keywords": [ + "Drupal", + "File" + ], + "support": { + "source": "http://cgit.drupalcode.org/file_delete", + "issues": "https://www.drupal.org/project/issues/file_delete" + } + }, { "name": "drupal/file_mdm", "version": "2.5.0", diff --git a/config/sync/block_class.settings.yml b/config/sync/block_class.settings.yml index f4f0cf98..aa77b077 100644 --- a/config/sync/block_class.settings.yml +++ b/config/sync/block_class.settings.yml @@ -3,6 +3,7 @@ maxlength_block_class_field: 255 field_type: multiple_textfields default_case: standard allow_only_letters_and_numbers: false +block_classes_stored: { } enable_attributes: true enable_auto_complete: true qty_classes_per_block: 10 @@ -13,6 +14,7 @@ enable_id_replacement: true weight_attributes: null weight_class: null weight_id: null +maxlength_attributes: 255 attribute_keys_stored: '[]' attribute_value_stored: '[]' attributes_inline: '[]' diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 591be34c..c2bcbdcd 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -57,6 +57,7 @@ module: field_group: 0 field_ui: 0 file: 0 + file_delete: 0 file_replace: 0 filter: 0 filter_perms: 0 diff --git a/config/sync/user.role.admin.yml b/config/sync/user.role.admin.yml index ecd4ff3e..f4afce7b 100644 --- a/config/sync/user.role.admin.yml +++ b/config/sync/user.role.admin.yml @@ -24,6 +24,7 @@ dependencies: - content_translation - field_ui - file + - file_delete - file_replace - filter - menu_admin_per_menu @@ -84,6 +85,7 @@ permissions: - 'delete any static content' - 'delete any theme content' - 'delete evenement revisions' + - 'delete files' - 'delete iframe revisions' - 'delete own actualite content' - 'delete own evenement content' diff --git a/config/sync/user.role.editeur.yml b/config/sync/user.role.editeur.yml index b648321b..b692c5b3 100644 --- a/config/sync/user.role.editeur.yml +++ b/config/sync/user.role.editeur.yml @@ -20,6 +20,7 @@ dependencies: module: - content_lock - file + - file_delete - file_replace - filter - node @@ -52,6 +53,7 @@ permissions: - 'create terms in villes' - 'create theme content' - 'delete any ressource content' + - 'delete files' - 'edit any actualite content' - 'edit any evenement content' - 'edit any iframe content' diff --git a/config/sync/views.view.centre_de_ressources.yml b/config/sync/views.view.centre_de_ressources.yml index 4f57114d..280f8336 100644 --- a/config/sync/views.view.centre_de_ressources.yml +++ b/config/sync/views.view.centre_de_ressources.yml @@ -642,6 +642,7 @@ display: placeholder_text: '' collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: false options_show_only_used_filtered: false field_programme_target_id: @@ -650,8 +651,10 @@ display: sort_options: false rewrite: filter_rewrite_values: '' + filter_rewrite_values_key: false collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: false options_show_only_used_filtered: false field_theme_target_id: @@ -660,8 +663,10 @@ display: sort_options: false rewrite: filter_rewrite_values: '' + filter_rewrite_values_key: false collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: false options_show_only_used_filtered: false field_ville_target_id: @@ -670,8 +675,10 @@ display: sort_options: false rewrite: filter_rewrite_values: '' + filter_rewrite_values_key: false collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: 0 options_show_only_used_filtered: 0 field_type_de_ressource_target_id: @@ -680,8 +687,10 @@ display: sort_options: false rewrite: filter_rewrite_values: '' + filter_rewrite_values_key: false collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: 0 options_show_only_used_filtered: 0 field_collections_target_id: @@ -690,8 +699,10 @@ display: sort_options: false rewrite: filter_rewrite_values: '' + filter_rewrite_values_key: false collapsible: false is_secondary: false + collapsible_disable_automatic_open: false options_show_only_used: 0 options_show_only_used_filtered: 0 access: diff --git a/config/sync/views.view.files.yml b/config/sync/views.view.files.yml index 6a4a3f4b..11db7a5c 100644 --- a/config/sync/views.view.files.yml +++ b/config/sync/views.view.files.yml @@ -1402,6 +1402,59 @@ display: text: remplacer output_url_as_text: 0 absolute: 0 + delete_file: + id: delete_file + table: file_managed + field: delete_file + relationship: none + group_type: group + admin_label: '' + entity_type: file + plugin_id: entity_link_delete + label: 'Lien pour supprimer Fichier' + 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: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + text: supprimer + output_url_as_text: false + absolute: false defaults: pager: true relationships: false diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 291a1819..c14a5b72 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 291a1819cafc26cb744ead3816158e1989f39082 +Subproject commit c14a5b72489cbcb32a013c84f2123f746c8b88dd