Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-32999 META: Files UI Stage 2 polishing in master
  3. MDL-33127

Adding two files from different sources to a filearea can get them confused

    Details

    • Type: Sub-task
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: 2.3
    • Fix Version/s: 2.3
    • Component/s: Files API
    • Labels:
      None

      Description

      How to reproduce:

      1) Add a file A to private files and save.
      2) Make a folder F in a course, and edit files
      3) Add a link A2 to the file A, in folder F
      4) Add a file B from wikimedia to the folder F (it is copied)
      5) Save the filearea F and reopen
      6) The wikimedia file has been replaced by a second copy of A2 (except the name).

        Gliffy Diagrams

          Activity

          Hide
          dougiamas Martin Dougiamas added a comment -

          As I demoed to you.

          Show
          dougiamas Martin Dougiamas added a comment - As I demoed to you.
          Hide
          dongsheng Dongsheng Cai added a comment - - edited

          Fixed it, it's the patch added this morning trying to improve the mimetype.

          commit: 423dd5b

          Show
          dongsheng Dongsheng Cai added a comment - - edited Fixed it, it's the patch added this morning trying to improve the mimetype. commit: 423dd5b
          Show
          dougiamas Martin Dougiamas added a comment - Marina: https://github.com/dongsheng/moodle/commit/423dd5b5e0afcf4ea0e2af7a6adc9fdc45e95d9e
          Hide
          marina Marina Glancy added a comment -

          done

          Show
          marina Marina Glancy added a comment - done
          Hide
          dougiamas Martin Dougiamas added a comment -

          Thanks! Closing as this will be integrated with the big branch shortly.

          Show
          dougiamas Martin Dougiamas added a comment - Thanks! Closing as this will be integrated with the big branch shortly.
          Hide
          dougiamas Martin Dougiamas added a comment -

          I'm still seeing this in integration.git

          Show
          dougiamas Martin Dougiamas added a comment - I'm still seeing this in integration.git
          Hide
          dongsheng Dongsheng Cai added a comment - - edited

          Martin, I cannot reproduce this my branch (I could reproduce it before this patch)

          Show
          dongsheng Dongsheng Cai added a comment - - edited Martin, I cannot reproduce this my branch (I could reproduce it before this patch)
          Hide
          poltawski Dan Poltawski added a comment -

          Is this a bug or not? If so please could we have better testing instructions than 'Another fix, please review.' - is it as the same replication instructions as in the bug summary?

          Show
          poltawski Dan Poltawski added a comment - Is this a bug or not? If so please could we have better testing instructions than 'Another fix, please review.' - is it as the same replication instructions as in the bug summary?
          Hide
          dongsheng Dongsheng Cai added a comment -

          It's the same bug summary, that's another bug causing the same problem

          Show
          dongsheng Dongsheng Cai added a comment - It's the same bug summary, that's another bug causing the same problem
          Hide
          dougiamas Martin Dougiamas added a comment -

          it is still happening for me, with exactly the same instructions.

          Show
          dougiamas Martin Dougiamas added a comment - it is still happening for me, with exactly the same instructions.
          Hide
          dongsheng Dongsheng Cai added a comment -

          Martin, this haven't been integrated yet.

          Show
          dongsheng Dongsheng Cai added a comment - Martin, this haven't been integrated yet.
          Hide
          marina Marina Glancy added a comment -

          Dongsheng, your commit mentioned above was integrated
          https://github.com/moodle/moodle/commit/70c1bc843a2d989ea29301bef45bc92cc25773e7

          or do you have something else?

          Show
          marina Marina Glancy added a comment - Dongsheng, your commit mentioned above was integrated https://github.com/moodle/moodle/commit/70c1bc843a2d989ea29301bef45bc92cc25773e7 or do you have something else?
          Show
          dongsheng Dongsheng Cai added a comment - Yes, this one: https://github.com/dongsheng/moodle/commit/65fead53fb2bb64800819d29695b397151df653e
          Hide
          dougiamas Martin Dougiamas added a comment -

          Aha, inside the loops. That looks like it.

          Show
          dougiamas Martin Dougiamas added a comment - Aha, inside the loops. That looks like it.
          Hide
          poltawski Dan Poltawski added a comment -

          Integrated, thanks

          Show
          poltawski Dan Poltawski added a comment - Integrated, thanks
          Hide
          poltawski Dan Poltawski added a comment -

          (would've been great to have unit test for this)

          Show
          poltawski Dan Poltawski added a comment - (would've been great to have unit test for this)
          Hide
          abgreeve Adrian Greeve added a comment -

          I managed to replicate this on my pre-patch copy of master. The integration version no longer has this issue. I didn't encounter any problems.
          Test passed
          Thanks.

          Show
          abgreeve Adrian Greeve added a comment - I managed to replicate this on my pre-patch copy of master. The integration version no longer has this issue. I didn't encounter any problems. Test passed Thanks.
          Hide
          stronk7 Eloy Lafuente (stronk7) added a comment -

          This issue has been integrated upstream and is now available both via git and cvs (and in some hours, via mirrors and downloads).

          Thanks!

          Show
          stronk7 Eloy Lafuente (stronk7) added a comment - This issue has been integrated upstream and is now available both via git and cvs (and in some hours, via mirrors and downloads). Thanks!

            People

            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:
                Fix Release Date:
                25/Jun/12