diff --git a/config/sync/core.entity_form_display.node.projet.default.yml b/config/sync/core.entity_form_display.node.projet.default.yml index 44afd82f..62c10dd9 100644 --- a/config/sync/core.entity_form_display.node.projet.default.yml +++ b/config/sync/core.entity_form_display.node.projet.default.yml @@ -27,12 +27,12 @@ third_party_settings: field_group: group_tabs: children: + - group_prin - group_textes - group_equipes - group_partenaires - group_liens - group_media - - group_prin parent_name: '' weight: 3 format_type: tabs @@ -120,6 +120,7 @@ third_party_settings: children: - status - promote + - field_memo parent_name: '' weight: 20 format_type: details_sidebar @@ -203,7 +204,7 @@ content: type: entity_reference_autocomplete region: content field_memo: - weight: 27 + weight: 2 settings: rows: 5 placeholder: '' @@ -288,7 +289,7 @@ content: region: content promote: type: boolean_checkbox - weight: 0 + weight: 1 region: content settings: display_label: true diff --git a/config/sync/migrate_plus.migration.d7_allpublicfiles.yml b/config/sync/migrate_plus.migration.d7_allpublicfiles.yml index 18fc0010..37cb7e4c 100644 --- a/config/sync/migrate_plus.migration.d7_allpublicfiles.yml +++ b/config/sync/migrate_plus.migration.d7_allpublicfiles.yml @@ -1,4 +1,4 @@ -uuid: 68572ca4-7034-4619-93fb-7746d5444c87 +uuid: 841402db-9c2a-490f-b9d8-b7635222ff7c langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_node_programme.yml b/config/sync/migrate_plus.migration.d7_node_programme.yml index eacd9742..811f7090 100644 --- a/config/sync/migrate_plus.migration.d7_node_programme.yml +++ b/config/sync/migrate_plus.migration.d7_node_programme.yml @@ -1,4 +1,4 @@ -uuid: 87cdeb88-a1c1-4b93-a825-af4ac6e1a64c +uuid: 70ec992f-6317-4548-a0d5-7312d708049a langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_node_projet.yml b/config/sync/migrate_plus.migration.d7_node_projet.yml index 761438a7..0138722f 100644 --- a/config/sync/migrate_plus.migration.d7_node_projet.yml +++ b/config/sync/migrate_plus.migration.d7_node_projet.yml @@ -1,9 +1,9 @@ -uuid: 7bc4232f-4cf7-47b8-a18f-55cb75054a79 +uuid: 9c90276c-fc70-4c57-b6c6-c6e019f399ea langcode: fr status: true dependencies: { } _core: - default_config_hash: 2YwRSmCFiJrKbOiF_Y33rBPNxqM9llOfJdc67FOg-lU + default_config_hash: Ao7_pCurVcLD722BrzKUfG6-hi5wqeGa55gblh-ILZE id: d7_node_projet class: null field_plugin_method: null @@ -65,6 +65,18 @@ process: plugin: migration_lookup migration: d7_node_projet source: nid + body: body + field_diaporama: + plugin: sub_process + source: diaporama + process: + target_id: + plugin: migration_lookup + migration: d7_allpublicfiles + source: fid + no_stub: true + alt: alt + title: title field_memo: field_memo destination: plugin: 'entity:node' diff --git a/config/sync/migrate_plus.migration.d7_node_theme.yml b/config/sync/migrate_plus.migration.d7_node_theme.yml index 39aa1464..c8f6f710 100644 --- a/config/sync/migrate_plus.migration.d7_node_theme.yml +++ b/config/sync/migrate_plus.migration.d7_node_theme.yml @@ -1,4 +1,4 @@ -uuid: 76257738-6915-4128-95f7-933ff4889c8d +uuid: be024a37-e0f3-4133-874c-0618ef044101 langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml index 04aa5f34..57c755b5 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_type_theme.yml @@ -1,4 +1,4 @@ -uuid: 7ab17bc8-b6e0-4687-932b-1648ef18b94d +uuid: 65728399-9895-4b60-ae00-a41ba9a9c7ae langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml b/config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml index 1406b941..8fe3280c 100644 --- a/config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml +++ b/config/sync/migrate_plus.migration.d7_taxonomy_term_ville.yml @@ -1,4 +1,4 @@ -uuid: 2e8300b7-a2a1-44da-81f7-935c84c24a13 +uuid: 232f115d-07fa-4758-9984-0afd44bd7b05 langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration.d7_users.yml b/config/sync/migrate_plus.migration.d7_users.yml index bb525928..09decd86 100644 --- a/config/sync/migrate_plus.migration.d7_users.yml +++ b/config/sync/migrate_plus.migration.d7_users.yml @@ -1,4 +1,4 @@ -uuid: b4840ade-bdc4-49ac-a1ac-8b34e1c72222 +uuid: b4ee97e9-2597-465f-8342-f1722ba9fcfc langcode: fr status: true dependencies: { } diff --git a/config/sync/migrate_plus.migration_group.popsu.yml b/config/sync/migrate_plus.migration_group.popsu.yml index 1cc71561..49de8778 100644 --- a/config/sync/migrate_plus.migration_group.popsu.yml +++ b/config/sync/migrate_plus.migration_group.popsu.yml @@ -1,4 +1,4 @@ -uuid: 6b775d9f-8a38-42ac-9fa0-1502ebc69527 +uuid: 3a602f8f-c61e-4156-a96e-5ae0630490d6 langcode: fr status: true dependencies: diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml index 7e1bdc8d..1e9e618a 100644 --- a/config/sync/views.view.content.yml +++ b/config/sync/views.view.content.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.storage.node.field_comparatifs_associes + - field.storage.node.field_diaporama - field.storage.node.field_image - field.storage.node.field_memo - field.storage.node.field_programme @@ -1748,14 +1749,14 @@ display: hide_alter_empty: true plugin_id: node_bulk_form entity_type: node - field_image: - id: field_image - table: node__field_image - field: field_image + field_diaporama: + id: field_diaporama + table: node__field_diaporama + field: field_diaporama relationship: none group_type: group admin_label: '' - label: Image + label: Diaporama exclude: false alter: alter_text: false @@ -1788,7 +1789,7 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: false + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true @@ -1804,7 +1805,7 @@ display: group_column: '' group_columns: { } group_rows: true - delta_limit: 0 + delta_limit: 1 delta_offset: 0 delta_reversed: false delta_first_last: false @@ -2320,7 +2321,7 @@ display: max-age: 0 tags: - 'config:field.storage.node.field_comparatifs_associes' - - 'config:field.storage.node.field_image' + - 'config:field.storage.node.field_diaporama' - 'config:field.storage.node.field_memo' - 'config:field.storage.node.field_programme' - 'config:field.storage.node.field_projets_lies' diff --git a/web/modules/custom/popsu_migrate/config/install/migrate_plus.migration.d7_node_projet.yml b/web/modules/custom/popsu_migrate/config/install/migrate_plus.migration.d7_node_projet.yml index ef0f4810..79f1faac 100644 --- a/web/modules/custom/popsu_migrate/config/install/migrate_plus.migration.d7_node_projet.yml +++ b/web/modules/custom/popsu_migrate/config/install/migrate_plus.migration.d7_node_projet.yml @@ -75,8 +75,21 @@ process: migration: d7_node_projet source: nid - field_memo: field_memo + body: body + field_diaporama: + plugin: sub_process + source: diaporama + process: + target_id: + plugin: migration_lookup + migration: d7_allpublicfiles + source: fid + no_stub: true + alt: alt + title: title + + field_memo: field_memo migration_dependencies: required: diff --git a/web/modules/custom/popsu_migrate/src/Plugin/migrate/source/D7NodeProjet.php b/web/modules/custom/popsu_migrate/src/Plugin/migrate/source/D7NodeProjet.php index 451da8ee..a329830c 100644 --- a/web/modules/custom/popsu_migrate/src/Plugin/migrate/source/D7NodeProjet.php +++ b/web/modules/custom/popsu_migrate/src/Plugin/migrate/source/D7NodeProjet.php @@ -139,6 +139,15 @@ class D7NodeProjet extends FieldableEntity { case 'field_popsu_projet_popsu': $field_programme = $field_values; break; + case 'field_popsu_ville_body': + $field_body = $field_values; + break; + case 'field_popsu_villeur_body': + $field_body = $field_values; + break; + case 'field_popsu_projet_presentation': + $field_body = $field_values; + break; } } if ($field_programme) { @@ -241,6 +250,32 @@ class D7NodeProjet extends FieldableEntity { $row->setSourceProperty('field_themes_lies', $field_themes_lies); } + // Body + if ($field_body) { + $field_body[0]['format'] = 'wysiwyg'; + $row->setSourceProperty('body', $field_body); + } + + // Diaporama + $field_diaporama = array(); + $img_src_fields = array( + 'field_popsu_ville_images_illustr', + 'field_popsu_projeteur_thumb', + 'field_popsu_projeteur_diapo', + 'field_popsu_projet_imageintro', + 'field_popsu_projet_imagelocalise', + ); + foreach ($img_src_fields as $field_name) { + if ($imgs = $row->getSourceProperty($field_name)) { + foreach ($imgs as $img) { + $field_diaporama[] = $img; + } + } + } + if (!empty($field_diaporama)) { + $row->setSourceProperty('diaporama', $field_diaporama); + } + // record migration errors in field_memo if(isset($memo)){ $field_memo = array(