71374[BUGFIX] Enable Export/Import of page translations
Commit message
Review
-
Code review CR +2 Done
- Christian Kuhn +2
- Garvin Hicking +1
- Stefan Bürk +1
-
Verified V +2 Done
- Christian Kuhn +2
- Garvin Hicking +1
- Stefan Bürk +1
- core-ci +1 CI
Issues 2
Files 8
- typo3/sysext/impexp/Classes/Export.php12+93 −1
- typo3/sysext/impexp/Classes/Import.php3+14 −2
- typo3/sysext/impexp/Tests/Functional/Export/MultilingualPagesAndTtContentTest.php6new+144 −0
- typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/pages-multilingual.csvnew+12 −0
- typo3/sysext/impexp/Tests/Functional/Fixtures/DatabaseImports/tt_content-multilingual.csvnew+9 −0
- typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-multilingual-onlysingle.xmlnew+129 −0
- typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-multilingual-single.xmlnew+177 −0
- typo3/sysext/impexp/Tests/Functional/Fixtures/XmlExports/pages-and-ttcontent-multilingual.xmlnew+618 −0
Review log 4465
Show 2440 earlier messages
-
Nikita Hovratov uploaded patch set 1 09/29/21, 17:56
-
Nikita Hovratov uploaded patch set 2 09/29/21, 18:09
-
core-ci voted on patch set 1 V -1 09/29/21, 18:11 Core CI is not happy: https://gitlab.typo3.org/typo3/CI/cms/-/pipelines/17318
-
core-ci voted on patch set 2 V -1 09/29/21, 18:26 Core CI is not happy: https://gitlab.typo3.org/typo3/CI/cms/-/pipelines/17319
-
Nikita Hovratov uploaded patch set 3 09/30/21, 06:56
-
core-ci voted on patch set 3 V +1 09/30/21, 07:12 Core CI is happy: https://gitlab.typo3.org/typo3/CI/cms/-/pipelines/17326
-
Nikita Hovratov marked it work in progress 10/07/21, 11:31
-
Benni Mack wrote 11/29/21, 10:12
Change destination moved from master to main -
Benni Mack updated the commit message in patch set 4 11/29/21, 13:37
-
Nikita Hovratov abandoned the change 04/04/22, 18:06
no time for that -
Nikita Hovratov restored the change 10/23/23, 06:29
-
Nikita Hovratov rebased onto patch set 5 10/23/23, 06:30
-
Nikita Hovratov commented on patch set 5 10/23/23, 06:30
This change is ready for review. -
Garvin Hicking commented on patch set 5 10/23/23, 06:32
will work on this -
core-ci voted on patch set 5 V -1 10/23/23, 06:42 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48064
-
Garvin Hicking uploaded patch set 6
V -110/31/23, 11:12 -
Garvin Hicking uploaded patch set 7 10/31/23, 11:18
-
core-ci voted on patch set 6 V -1 10/31/23, 11:29 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48394
-
core-ci voted on patch set 7 V -1 10/31/23, 11:32 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48396
-
Garvin Hicking uploaded patch set 8
V -110/31/23, 11:49 -
core-ci voted on patch set 8 V -1 10/31/23, 11:58 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48400
-
Garvin Hicking uploaded patch set 9
V -110/31/23, 12:42 -
Garvin Hicking commented on patch set 9 10/31/23, 12:44
Stardate 20231031.1342, Garvin's supplemental. Rebased on top of current main (might make backports tougher due to recent changes; note QueryBuilder not using PARAM_STR_ARRAY). Also addressed that translated pages were not considered "inside page tree", which broke functional tests. So I moved them from "outside page tree" to their "inside" section. Basic export and import at this point seems to work nicely. Will test some more edge cases. -
core-ci voted on patch set 9 V -1 10/31/23, 12:53 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48401
-
Garvin Hicking uploaded patch set 10
V -110/31/23, 12:55 -
core-ci voted on patch set 10 V -1 10/31/23, 13:05 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48403
-
Garvin Hicking uploaded patch set 11
V -110/31/23, 13:46Fix Tests by adjusting pagetree again -
core-ci voted on patch set 11 V -1 10/31/23, 13:53 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48406
-
Garvin Hicking uploaded patch set 12
V -110/31/23, 13:57Move comments to iteration and remove redundant code -
core-ci voted on patch set 12 V +1 10/31/23, 14:05 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48407
-
Garvin Hicking uploaded patch set 13
V +111/03/23, 12:55Support exporting a single language -
core-ci voted on patch set 13 V +1 11/03/23, 13:02 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48547
-
Garvin Hicking uploaded patch set 14
V +111/03/23, 14:47Add very basic fixture and testing stub -
core-ci voted on patch set 14 V +1 11/03/23, 14:56 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48551
-
Garvin Hicking uploaded patch set 15
V +111/10/23, 14:48Add proper tests and fixtures -
core-ci voted on patch set 15 V -1 11/10/23, 14:57 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48791
-
Garvin Hicking uploaded patch set 16
V -111/10/23, 16:08Make Tests deterministic by using sorting table field -
core-ci voted on patch set 16 V -1 11/10/23, 16:15 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48794
-
Garvin Hicking uploaded patch set 17
V -111/10/23, 16:18Fix CGL -
core-ci voted on patch set 17 V +1 11/10/23, 16:26 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/48795
-
Garvin Hicking commented on patch set 17 V +1 CR +1 11/10/23, 16:37
Open for review! And since I'm not listed as an author I can technically vote for it 😇 -
Simon Schaufelberger commented on patch set 17 11/16/23, 00:42
Export.php:312Would it make sense to put this in some kind of repository class?MultilingualPagesAndTtContentTest.php:26indentation doesn't look right hereMultilingualPagesAndTtContentTest.php:30indentation doesn't look right hereMultilingualPagesAndTtContentTest.php:33different code style: ``` protected array $recordTypesIncludeFields = [ 'pages' => [ 'title', 'deleted', 'doktype', 'hidden', 'perms_everybody', 'l10n_parent', 'l10n_source', 'sys_language_uid', 'sorting', ], 'tt_content' => [ 'CType', 'header', 'deleted', 'l18n_parent', // note l18n vs. l10n 'l10n_source', 'sys_language_uid', 'sorting', ], ]; ``` -
Garvin Hicking uploaded patch set 18
CR +1V +111/16/23, 08:54Rebased and adjusted indentation -
Garvin Hicking commented on patch set 18 11/16/23, 08:56
Thanks Simon for getting into this. I fixed the indentation. I copied the Test from `typo3-core/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php` and that had the same "wrong" indentation. Not sure I should fix that file too, because it changes the scope of this patch. But now at least this test has proper indentation.Export.php:312Reply(This part comes from Nikita) - I think due to the usage of 'yield' it might make it troublesome within a repository? Also I think the ImpExp-module needs some more major refactoring, so doing it at this point would change the scope of this bugfix (and also maybe make backporting to older versions harder). Purely architecturally, I fully agree with you of course!MultilingualPagesAndTtContentTest.php:26ReplyDoneMultilingualPagesAndTtContentTest.php:30ReplyDoneMultilingualPagesAndTtContentTest.php:33ReplyDone -
core-ci voted on patch set 18 V +1 11/16/23, 09:01 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49006
-
Simon Schaufelberger commented on patch set 18 11/16/23, 11:38
Export.php:312ReplyAh yes, because the function is called as an iterator, it needs to be refactored in order to be used as a proper method within a class. Still, DB stuff should be kept in one place... -
Simon Schaufelberger voted on patch set 18 CR +1 11/16/23, 11:38
-
Garvin Hicking voted on patch set 18 V +1 CR +1 11/16/23, 13:41
-
Garvin Hicking uploaded patch set 19
CR +1V +111/21/23, 10:16Made helper method protected changed scope to 12 and mainn -
core-ci voted on patch set 19 V +1 11/21/23, 10:26 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49209
-
Christian Kuhn commented on patch set 18 11/21/23, 11:14
Hey. I'd opt to remove v11 from backport list: This patch is a bit too intrusive, a bit too risky and the issue is not critical enough. If anyone *really* needs this in v11, it should backport the patch into the affected instance itself. -
Oliver Hader commented on patch set 19 11/21/23, 11:48
Export.php:270Wouldn't `$this->dat['header']['pagetree'][(int)$pageTranslation['uid']]['uid'] = ...` enough here → thus, omitting the if-checkExport.php:319Other parts of the export functionality seem to apply a restriction for the live workspace - which seems to be missing hereExport.php:505`$restrictToLanguageIds !== []`? (`count` is not relevant here)Import.php:1055File and `l10n_source` - I did not check it, but it seems to be strange... -
Garvin Hicking uploaded patch set 20
V +111/21/23, 12:58Refactor to use ctrl TCA enable workspace restriction -
core-ci voted on patch set 20 V -1 11/21/23, 13:04 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49229
-
Garvin Hicking uploaded patch set 21
V -111/21/23, 13:29CGL -
core-ci voted on patch set 21 V +1 11/21/23, 13:34 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49230
-
Christian Kuhn commented on patch set 21 11/21/23, 13:55
Export.php:270ReplyDoneExport.php:319ReplyDoneExport.php:505ReplyDoneImport.php:1055ReplyDone -
Christian Kuhn uploaded patch set 22
V +111/21/23, 14:27 -
core-ci voted on patch set 22 V +1 11/21/23, 14:33 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/49236
-
Christian Kuhn voted on patch set 22 V +1 CR +1 11/21/23, 14:37
-
Garvin Hicking commented on patch set 22 V +1 CR +1 11/21/23, 14:38
Export.php:270ReplyThanks, yes!Export.php:319ReplyAckExport.php:505ReplyAckImport.php:1055ReplyProbably it applies more to type=db rather than file. This is part of Nikitas original implementation, but I believe due to the fielname fixation to "l10n_source" it should help. Refactored to lookup the TCA ctrl here to be more sure. -
Stefan Bürk voted on patch set 22 V +1 CR +1 11/21/23, 14:45
-
Simon Schaufelberger wrote 11/21/23, 15:03
Removed reviewer Simon Schaufelberger. -
Christian Kuhn voted on patch set 22 V +2 CR +2 11/21/23, 15:19
-
Christian Kuhn merged patch set 23 11/21/23, 15:19