Review main Merged

66054[BUGFIX] Restore contentObject condition in EXT:form

Georg Ringer CR +2 V +2 Easy +6 −1 updated 02/24/22, 10:58

Commit message

With #86196 the condition for `contentObject` has been
accidentally removed.

Review

  • Code review CR +2 Done
    • waldhacker +2
    • Christian Kuhn +1
    • Oliver Hader +1
    • Elias Häußler +1
  • Verified V +2 Done
    • waldhacker +2
    • Christian Kuhn +1
    • Elias Häußler +1
    • core-ci +1 CI

Issues 2

Files 1

Review log 4658

Show 2633 earlier messages
  1. Georg Ringer uploaded patch set 1 10/06/20, 09:23

  2. Georg Ringer commented on patch set 1 10/06/20, 09:23

    This change is ready for review.
  3. TYPO3com voted on patch set 1 V +1 10/06/20, 09:47 Completed build in 16m 07s on Tue, 6 Oct, 09:47 AM Test Summary: 73785 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-6262

  4. Björn Jacob voted on patch set 1 V +1 CR +1 10/06/20, 10:37

  5. Josef Glatz voted on patch set 1 CR +1 10/06/20, 11:32

  6. Daniel Goerz commented on patch set 1 CR -1 10/06/20, 14:25

    FormRuntime.php:1071

    If $this->getTypoScriptFrontendController() can return null this can break, if it cannot return null, the method is wrongly typed.
  7. Georg Ringer uploaded patch set 2 10/06/20, 19:09

  8. TYPO3com voted on patch set 2 V -1 10/06/20, 19:24 Completed build in 15m 10s on Tue, 6 Oct, 07:24 PM Test Summary: 9 of 74270 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-6299

  9. Georg Ringer rebased onto patch set 3 10/07/20, 17:18

  10. TYPO3com voted on patch set 3 V -1 10/07/20, 17:30 Completed build in 11m 39s on Wed, 7 Oct, 05:30 PM Test Summary: 73776 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-6335

  11. Oli Bartsch commented on patch set 3 10/08/20, 07:55

    FormRuntime.php:1070

    can be left out as the $this->getTypoScriptFrontendController() check confirms frontend context already.
  12. Georg Ringer uploaded patch set 4 01/28/21, 18:17

  13. TYPO3com voted on patch set 4 V +1 01/28/21, 18:29 Completed build in 11m 37s on Thu, 28 Jan, 06:29 PM Test Summary: 32601 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9086

  14. Georg Ringer rebased onto patch set 5 03/24/21, 19:19

  15. TYPO3com voted on patch set 5 V +1 03/24/21, 19:26 Completed build in 06m 18s on Wed, 24 Mar, 07:26 PM Test Summary: 32914 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-10338

  16. core-ci voted on patch set 5 V +1 03/24/21, 19:35 Core CI is happy: https://core.b13.com/typo3-core/typo3.cms/-/pipelines/1820

  17. Christian Kuhn commented on patch set 5 03/26/21, 17:04

    Related: #89196
  18. Georg Ringer commented on patch set 5 04/01/21, 19:48

    Reply

    are you sure?
  19. Christian Kuhn commented on patch set 5 05/20/21, 19:26

    Reply

    the 6-9 typo beside, you mention the issue in the commit text - why not set is as "Related: #86196" then?
  20. Christian Kuhn updated the commit message in patch set 6 05/20/21, 21:14

  21. Christian Kuhn voted on patch set 6 CR +1 05/20/21, 21:16

  22. core-ci voted on patch set 6 V +1 05/20/21, 21:22 Core CI is happy: https://gitlab.typo3.org/TYPO3/CI/cms/-/pipelines/11753

  23. Christian Kuhn voted on patch set 6 V +1 05/28/21, 10:02

  24. Oli Bartsch commented on patch set 6 V -1 05/28/21, 12:12

    "contentObject" always holds the page record not

    FormRuntime.php:1204

    This will contain the page record of the current page. According to the docs (https://docs.typo3.org/c/typo3/cms-form/master/en-us/I/Concepts/Variants/Index.html#contentobject-array), I think this is not the intention here. Especially because page record is always accessible via "getTSFE().page".
  25. Oli Bartsch commented on patch set 6 05/28/21, 12:38

    Reply

    Mhm, forgot this draft.
  26. Christian Kuhn voted on patch set 6 V 0 CR 0 05/28/21, 13:00

  27. waldhacker commented on patch set 6 08/13/21, 11:38

    FormRuntime.php:1204 Reply

    That was the intention (see https://review.typo3.org/c/Packages/TYPO3.CMS/+/58232/33/typo3/sysext/form/Classes/Domain/Condition/ConditionProvider.php#b87) cObj->data *can* contain the page data or the data from the surrounding content object based on the current context.
  28. waldhacker voted on patch set 6 CR +1 08/13/21, 11:38

  29. Tobias Wollender commented on patch set 6 V +1 09/26/21, 10:37

    Needed the functionality described in the docs (https://docs.typo3.org/c/typo3/cms-form/master/en-us/I/Concepts/Variants/Index.html#contentobject-array) and this patch made it work.
  30. Oli Bartsch commented on patch set 6 V 0 11/02/21, 09:25

    FormRuntime.php:1204 Reply

    Ack
  31. Oli Bartsch commented on patch set 6 V +1 CR +1 11/17/21, 20:29

    Still not 100% sure if this will always lead to the intended result, but at least the the previous behaviour is restored.

    Reply

    Done

    FormRuntime.php:1070 Reply

    Done

    FormRuntime.php:1071 Reply

    Done
  32. Benni Mack updated the commit message in patch set 7 11/18/21, 10:51

  33. Benni Mack updated the commit message in patch set 8 11/18/21, 10:51

  1. core-ci voted on patch set 8 V +1 11/18/21, 12:23 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19489

  2. core-ci voted on patch set 7 V +1 11/18/21, 12:38 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/19488

  3. Benni Mack wrote 11/29/21, 10:18

    Change destination moved from master to main
  4. Benni Mack updated the commit message in patch set 9 11/29/21, 14:08

  5. Elias Häußler voted on patch set 9 V +1 CR +1 02/23/22, 08:59

  6. Björn Jacob voted on patch set 9 V +1 CR +1 02/23/22, 15:16

  7. waldhacker updated the commit message in patch set 10 02/23/22, 15:19

  8. Björn Jacob voted on patch set 10 V +1 CR +1 02/23/22, 15:20

  9. Elias Häußler voted on patch set 10 V +1 CR +1 02/23/22, 15:20

  10. core-ci voted on patch set 10 V -1 02/23/22, 15:21 Core CI is not happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/24117

  11. Elias Häußler rebased onto patch set 11 02/23/22, 15:27

  12. Elias Häußler voted on patch set 11 V +1 CR +1 02/23/22, 15:28

  13. waldhacker voted on patch set 11 CR -1 02/23/22, 15:39

  14. waldhacker uploaded patch set 12 02/23/22, 15:40

  15. core-ci voted on patch set 11 V +1 02/23/22, 15:41 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/24118

  16. waldhacker commented on patch set 12 02/23/22, 15:43

    FormRuntime.php:1204 Reply

    You were right, it is the page record. I have adjusted the patch so that "contentObjectData" contains the data of the current content element as documented.
  17. core-ci voted on patch set 12 V +1 02/23/22, 15:57 Core CI is happy: https://git.typo3.org/typo3/CI/cms/-/pipelines/24119

  18. Oliver Hader commented on patch set 12 02/23/22, 16:34

    FormRuntime.php:1137

  19. Oliver Hader voted on patch set 12 CR +1 02/23/22, 16:38

  20. waldhacker commented on patch set 12 02/23/22, 16:49

    FormRuntime.php:1137 Reply

    True, because the old code used the cObj from the tsfe (what was already wrong at that time because the tsfe cObj represents the page record and not the current content element record). Since the cObj is now taken from the configuration manager it does not need this check anymore.
  21. Elias Häußler voted on patch set 12 V +1 CR +1 02/24/22, 10:45

  22. Christian Kuhn commented on patch set 12 V +1 CR +1 02/24/22, 10:55

    FormRuntime.php:1137 Reply

    Done
  23. Christian Kuhn commented on patch set 12 02/24/22, 10:56

    Reply

    Done
  24. waldhacker voted on patch set 12 V +2 CR +2 02/24/22, 10:58

  25. waldhacker merged patch set 13 02/24/22, 10:58