Review main Merged

52048[TASK] Implement conflict handling into renameFile()

Anja Leichsenring CR +2 V +2 Hard +362 −45 updated 03/18/17, 18:46

Commit message

Upon DuplicationBehaviour::RENAME and ~::REPLACE, the according function
is called for the given file. For DuplicationBehaviour::CANCEL, the same
exception as before is thrown.

For a better UX, the existance of a possible duplicate is checked and a
modal window is rendered to the users to let them choose the desired
action if a duplicate was found.

Review

  • Code review CR +2
    • Andreas Kienast +2
    • Frank Nägler +1
  • Verified V +2
    • Andreas Kienast +2
    • Frank Nägler +1
    • TYPO3com +1 CI

Issues 1

Files 13

Review log 2638

Show 913 earlier messages
  1. Anja Leichsenring uploaded patch set 1 03/15/17, 09:40

  2. TYPO3com voted on patch set 1 V -1 03/15/17, 09:55 Completed build in 15m 00s on Wed, 15 Mar, 10:55 AM Test Summary: 1 of 56512 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9185

  3. Riccardo De Contardi commented on patch set 1 03/15/17, 10:35

    after installing the patch: - if I try to rename a file with a name that is already existing, the original one is renamed file_01.ext - if I try to rename a folder the exception "Directory "b" was not renamed! There might be a problem with write permissions in "a"?" is thrown. Is there something else to test?
  4. Anja Leichsenring uploaded patch set 2 03/15/17, 15:37

  5. Josef Glatz commented on patch set 2 CR -1 03/15/17, 15:43

    there's something wrong
  6. Andreas Kienast commented on patch set 2 CR -2 03/15/17, 15:44

    Will improve the patch UX wise
  7. TYPO3com voted on patch set 2 V -1 03/15/17, 15:51 Completed build in 13m 52s on Wed, 15 Mar, 04:51 PM Test Summary: 56503 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9204

  8. Anja Leichsenring uploaded patch set 3 03/15/17, 15:51

  9. TYPO3com voted on patch set 3 V -1 03/15/17, 15:59 Completed build in 06m 54s on Wed, 15 Mar, 04:59 PM Test Summary: 1 of 56512 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9206

  10. Andreas Kienast uploaded patch set 4 03/18/17, 11:25

  11. Andreas Kienast commented on patch set 4 03/18/17, 11:26

    A new JS is introduced as UX improvement that renders a modal if renaming would result in a duplicated file. Still missing: pass the chosen action to the PHP controller to control the DuplicationBehavior thing. Until this is fixed, I'll keep the -2
  12. TYPO3com voted on patch set 4 V -1 03/18/17, 11:32 Completed build in 07m 11s on Sat, 18 Mar, 12:32 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9304

  13. Anja Leichsenring uploaded patch set 5 03/18/17, 13:11

  1. Andreas Kienast voted on patch set 5 CR 0 03/18/17, 13:12

  2. TYPO3com voted on patch set 5 V -1 03/18/17, 13:17 Completed build in 06m 00s on Sat, 18 Mar, 02:17 PM Test Summary: 6 of 56530 failed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9305

  3. Andreas Kienast commented on patch set 5 03/18/17, 13:34

    RenameFile.js:67

    This should be "warning" instead, as the buttons should always reflect the severity of the modal.

    RenameFile.js:78

    Personally, I dislike this change as the user doesn't have the possibility to "abort" and try a renaming again without getting redirected to the filelist and receiving an error message. But I won't argue if most people think this is "the right" solution.
  4. Anja Leichsenring uploaded patch set 6 03/18/17, 13:53

  5. TYPO3com voted on patch set 6 V +1 03/18/17, 13:59 Completed build in 06m 01s on Sat, 18 Mar, 02:59 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9306

  6. Anja Leichsenring uploaded patch set 7 03/18/17, 14:21

  7. TYPO3com voted on patch set 7 V +1 03/18/17, 14:30 Completed build in 07m 57s on Sat, 18 Mar, 03:30 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9307

  8. Frank Nägler uploaded patch set 8 03/18/17, 15:27

  9. Frank Nägler voted on patch set 8 CR +1 V +1 03/18/17, 15:30

  10. Anja Leichsenring uploaded patch set 9 03/18/17, 15:31

  11. Anja Leichsenring uploaded patch set 10 03/18/17, 15:34

  12. Anja Leichsenring uploaded patch set 11 03/18/17, 15:36

  13. TYPO3com voted on patch set 8 V +1 03/18/17, 15:40 Completed build in 12m 55s on Sat, 18 Mar, 04:40 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9314

  14. TYPO3com voted on patch set 10 V -1 03/18/17, 15:42 Completed build in 07m 50s on Sat, 18 Mar, 04:42 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9316

  15. Riccardo De Contardi commented on patch set 11 V -1 03/18/17, 15:44

    - renaming files: ok works well (the only negative point IMO is that the popup is different respect to the "overwrite existing file" popup, I think that they should be if not the same, at least more similar (but this is not too much important) - renaming folders If I try to rename a folder with the same name of an existing NOT EMPTY folder, the following exception is thrown: PHP Warning: rename(/Mamp-sites/typo3.7.master/fileadmin/Templates/ccc/b,/Mamp-sites/typo3.7.master/fileadmin/Templates/ccc/a): Directory not empty in / TYPO3-dists/typo3_7_master/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php line 1140 More information regarding this error might be available online.
  16. TYPO3com voted on patch set 11 V -1 03/18/17, 15:44 Completed build in 08m 47s on Sat, 18 Mar, 04:44 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9317

  17. Anja Leichsenring commented on patch set 11 03/18/17, 16:11

    this is renameFile, not renameFolder. Folders are not included in this change. Their behavior has not changed.
  18. Anja Leichsenring uploaded patch set 12 03/18/17, 16:13

  19. Riccardo De Contardi commented on patch set 12 V +1 03/18/17, 16:19

    renaming files works fine
  20. TYPO3com voted on patch set 12 V +1 03/18/17, 16:29 Completed build in 15m 45s on Sat, 18 Mar, 05:29 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9319

  21. Andreas Kienast uploaded patch set 13 03/18/17, 17:10

  22. TYPO3com voted on patch set 13 V +1 03/18/17, 17:16 Completed build in 06m 15s on Sat, 18 Mar, 06:16 PM Test Summary: 56521 passed Find logs and detail information at https://bamboo.typo3.com/browse/CORE-GTC-9320

  23. Frank Nägler voted on patch set 13 CR +1 V +1 03/18/17, 18:44

  24. Andreas Kienast voted on patch set 13 CR +2 V +2 03/18/17, 18:46

  25. Gerrit merged patch set 13 03/18/17, 18:46