diff --git a/composer.json b/composer.json index d1536fd..724484b 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "drupal/editor_advanced_link": "^2.2", "drupal/geofield": "^1.60", "drupal/image_delta_formatter": "^1.2", - "drupal/image_field_caption": "^2.0", + "drupal/image_field_caption": "2.0.x-dev@dev", "drupal/leaflet": "^10.2", "drupal/leaflet_more_maps": "^2.2", "drupal/linked_field": "^1.5", @@ -128,7 +128,12 @@ "patches": { "drupal/social_media_links":{ "Replace Twitter with X https://www.drupal.org/project/social_media_links/issues/3384469": "https://www.drupal.org/files/issues/2023-09-12/social_media_links-change_twitter_to_x-3384469-7.patch" + }, + "drupal/image_field_caption":{ + "Rewrite module to use default field storage https://www.drupal.org/project/image_field_caption/issues/3472997": "./patches/image_field_caption_3472997_12.patch" } + }, + "oldpatches": { } } } diff --git a/composer.lock b/composer.lock index 03e7dc4..5e3d29e 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": "3f682451141745b61e2f384d1c28ce84", + "content-hash": "21ca923d67e614146f8e96c3190d1cde", "packages": [ { "name": "asm89/stack-cors", @@ -4550,29 +4550,26 @@ }, { "name": "drupal/image_field_caption", - "version": "2.0.1", + "version": "dev-2.0.x", "source": { "type": "git", "url": "https://git.drupalcode.org/project/image_field_caption.git", - "reference": "2.0.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/image_field_caption-2.0.1.zip", - "reference": "2.0.1", - "shasum": "053e1ccfc638b3b2cd5c59c3c6a053e4e5041183" + "reference": "b0c155d5aac125666f01c0aa102a8a1f88b1f955" }, "require": { "drupal/core": "^9 || ^10" }, "type": "drupal-module", "extra": { + "branch-alias": { + "dev-2.0.x": "2.0.x-dev" + }, "drupal": { - "version": "2.0.1", - "datestamp": "1705443097", + "version": "2.0.x-dev", + "datestamp": "1711647363", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Dev releases are not covered by Drupal security advisories." } } }, @@ -12961,6 +12958,7 @@ "drupal/entity_clone": 20, "drupal/field_group": 20, "drupal/filter_perms": 20, + "drupal/image_field_caption": 20, "drupal/inline_entity_form": 5, "drupal/linkit": 10, "drupal/login_destination": 20, diff --git a/config/sync/core.entity_view_display.paragraph.site_diapo.default.yml b/config/sync/core.entity_view_display.paragraph.site_diapo.default.yml index 076d55f..78741e0 100644 --- a/config/sync/core.entity_view_display.paragraph.site_diapo.default.yml +++ b/config/sync/core.entity_view_display.paragraph.site_diapo.default.yml @@ -4,7 +4,7 @@ status: true dependencies: config: - field.field.paragraph.site_diapo.field_images - - image.style.wide + - image.style.very_large - paragraphs.paragraphs_type.site_diapo module: - image_field_caption @@ -17,12 +17,12 @@ content: type: image_caption label: visually_hidden settings: - image_style: wide + image_style: very_large image_link: '' image_loading: attribute: lazy third_party_settings: { } - weight: 0 + weight: 2 region: content hidden: search_api_excerpt: true diff --git a/config/sync/field.field.node.actualite.field_images.yml b/config/sync/field.field.node.actualite.field_images.yml index f828982..0adcbb6 100644 --- a/config/sync/field.field.node.actualite.field_images.yml +++ b/config/sync/field.field.node.actualite.field_images.yml @@ -13,6 +13,7 @@ third_party_settings: translation_sync: alt: alt title: title + caption: caption file: '0' id: node.actualite.field_images field_name: field_images @@ -43,6 +44,6 @@ settings: width: null height: null caption: '' - caption_field: 1 - caption_field_required: 0 + caption_field: true + caption_field_required: false field_type: image diff --git a/config/sync/field.storage.node.field_images.yml b/config/sync/field.storage.node.field_images.yml index 5ab8658..95dbfc6 100644 --- a/config/sync/field.storage.node.field_images.yml +++ b/config/sync/field.storage.node.field_images.yml @@ -21,6 +21,7 @@ settings: title: '' width: null height: null + caption: '' module: image locked: false cardinality: -1