Merge pull request #19 from ignetic/main

Updated for EE3 - EE7

Author: robinsowell

el_playamatrix_importer/README.md

@@ -1,4 +1,4 @@
-# Playa & Matrix Importer for ExpressionEngine 2
+# Playa & Matrix Importer for ExpressionEngine 2 - 7
 
 [![Build Status](https://travis-ci.org/EllisLab/PlayaMatrixImporter.svg?branch=master)](https://travis-ci.org/EllisLab/PlayaMatrixImporter)
 
@@ -8,9 +8,9 @@ This is a module for importing existing Playa and Matrix fields into new Relatio
 
 This importer was developed and tested in the context of at least:
 
-* ExpressionEngine 2.10.2
-* Matrix 2.6.1
-* Playa 4.5.2
+* ExpressionEngine 2.10.2 +
+* Matrix 2.6.1 +
+* Playa 4.5.2 +
 
 Best to make sure any third-party celltypes you have that are also compatible with Grid are up-to-date as well to ensure their Grid implementations are in place.
 
@@ -31,6 +31,7 @@ Each celltype native to Matrix has been mapped to a native EE near-equivalent. I
 
 | Matrix celltype         | Mapped native fieldtype                      |
 | ----------------------- | -------------------------------------------- |
+| Assets                  | Assets                                       |
 | Date                    | Date                                         |
 | Fieldpack Checkboxes    | Checkboxes                                   |
 | Fieldpack Dropdown      | Select                                       |
@@ -43,7 +44,9 @@ Each celltype native to Matrix has been mapped to a native EE near-equivalent. I
 | Number                  | Text (with number content type)              |
 | Playa                   | Relationship                                 |
 | Rich Text               | Rich Text                                    |
+| Wygwam                  | Wygwam                                       |
 | Text                    | Text for single line, Textarea for multiline |
+| Structure               | Structure                                    |
 
 ## Gotchas
 
@@ -68,6 +71,11 @@ If you run into anything, head on over to [the issues](https://github.com/EllisL
 
 ## Change Log
 
+- 1.0.10 - Apr 25, 2023
+    - Fixed issue with inserting field 'field_list_items' in sql strict mode (Mar 29, 2023)
+    - Added support for Structure field in Matrix.
+- 1.0.9 - March 06, 2023
+    - Enabled assets importing from Matrix columns. Tested in EE7.
 - 1.0.8 - June 21, 2017
     - Fixed a bug (#10) where the importer may error when encountering orphaned Playa or Assets data.
 - 1.0.7 - May 30, 2017

el_playamatrix_importer/addon.setup.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'author'      => 'Packet Tide',
+    'author_url'  => 'https://packettide.com/',
+    'name'        => 'Playa & Matrix Importer',
+    'description' => 'Playa & Matrix Importer for ExpressionEngine 2-7',
+    'version'     => '1.0.10',
+    'namespace'   => 'User\Addons\PlayaMatrixImporter',
+    'docs_url'    => '',
+    'settings_exist' => TRUE,
+);

el_playamatrix_importer/language/english/lang.el_playamatrix_importer.php

@@ -7,15 +7,20 @@
 	'el_playamatrix_importer_module_description' =>
 	'Creates new Relationships and Grid fields from Playa and Matrix fields.',
 
-	'el_playamatrix_importer_module_long_description' => "<p>This module will import existing Playa and Matrix fields into new Relationship and Grid fields. The import is <b>non-destructive</b>, meaning it doesn't convert or change the existing fields or data in any way. It creates <em>new</em> fields and copies the data over to them, so you have a chance to inspect and check that the import has done its job before you commit to the new fields.</p><p>Backup your database in case you want to rollback, then click Import to get started.</p>",
+	'el_playamatrix_importer_module_long_description' => "<p>This module will import existing Playa and Matrix fields into new Relationship and Grid fields. The import is <b>non-destructive</b>, meaning it doesn't convert or change the existing fields or data in any way. It creates <b>new</b> fields and copies the data over to them, so you have a chance to inspect and check that the import has done its job before you commit to the new fields.</p><p>Backup your database in case you want to rollback, then click Import to get started.</p>",
+
+	'el_playamatrix_fields' => 'Playa & Matrix Fields',
 
 	'module_home' => 'Playa & Matrix Importer Home',
 
 	'grid_relationships_not_installed' => 'Please make sure both Grid and Relationships are installed before importing.',
 
 	'btn_import' => 'Import',
 
-	'import_completed' => 'Success: Import has created %d new Relationship fields and %d new Grid fields'
+	'import_success' => 'Import Successful',
+	'import_fail' => 'Import Failed',
+	'import_completed' => 'Success: Import has created %d new Relationship fields and %d new Grid fields',
+	'import_no_fields' => 'Failed: No Matrix or Playa fields selected'
 );
 
 // EOF

el_playamatrix_importer/libraries/PlayaMatrixImporter/Converters/MatrixConverter.php

@@ -113,6 +113,7 @@ public static function convertMatrixColumns($columns, $grid_fieldtypes, $field_i
 	public static function mapColumnType($from_cell_type, $settings, $grid_fieldtypes = array())
 	{
 		$col_type_mapping = array(
+			'assets'					=> 'assets',
 			'date'						=> 'date',
 			'fieldpack_checkboxes'		=> 'checkboxes',
 			'fieldpack_dropdown'		=> 'select',
@@ -125,7 +126,9 @@ public static function mapColumnType($from_cell_type, $settings, $grid_fieldtype
 			'number'					=> 'text',
 			'playa'						=> 'relationship',
 			'rte'						=> 'rte',
-			'text'						=> 'text'
+			'wygwam'					=> 'wygwam',
+			'text'						=> 'text',
+			'structure'					=> 'structure'
 		);
 
 		// Make sure Text celltypes with the multiline option set to 'y'