Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed files copy/move when in favorites or recent section #8945

Merged
merged 1 commit into from Apr 3, 2018

Conversation

skjnldsv
Copy link
Member

Fix #8851

@skjnldsv skjnldsv added this to the Nextcloud 14 milestone Mar 22, 2018
@skjnldsv skjnldsv self-assigned this Mar 22, 2018
}
if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) {
context.fileList.move(filename, targetPath);
context.fileList.move(filename, targetPath, false, context.dir);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

move() doesn't have a 4th parameter

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

facepalm

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't judge me ^^'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Never occurred to me ;)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@skjnldsv The first time MoveCopy successfully . Error still occurs when the file is moved or copied a second time

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HandsomeBoby a second time after reload? In the same location?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@skjnldsv Not understand what you mean. I mean, in the Recent, choose a file for MoveCopy is successfully, reloading, there was an error while making a second MoveCopy to this file.
such as:
image
image this is successfully! reloading
image
image There was an error.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! :)
let me try!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, can't reproduce with the last patch, it works great! :)
Let's get this in!

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@skjnldsv
Sorry,My English is a bit bad.
On the recent page,move a file in the folder to the “/”, an error occurred while moving this file again. Not need to reload.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the fix-files-copy-in-recent-favorites branch from 5c24e1b to 24ecf3f Compare March 22, 2018 17:09
@codecov
Copy link

codecov bot commented Mar 22, 2018

Codecov Report

Merging #8945 into master will increase coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##             master    #8945      +/-   ##
============================================
+ Coverage     51.88%   51.96%   +0.07%     
+ Complexity    25270    25269       -1     
============================================
  Files          1603     1603              
  Lines         94878    94878              
  Branches       1388     1388              
============================================
+ Hits          49228    49301      +73     
+ Misses        45650    45577      -73
Impacted Files Coverage Δ Complexity Δ
apps/files_trashbin/lib/Expiration.php 90.32% <0%> (-1.62%) 29% <0%> (ø)
lib/private/Files/Node/Folder.php 89.25% <0%> (ø) 61% <0%> (-1%) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.7% <0%> (+0.24%) 136% <0%> (ø) ⬇️
lib/private/Files/ObjectStore/SwiftFactory.php 52% <0%> (+52%) 37% <0%> (ø) ⬇️
lib/private/Files/ObjectStore/Swift.php 72.41% <0%> (+72.41%) 9% <0%> (ø) ⬇️

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@skjnldsv skjnldsv added 2. developing Work in progress 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews 2. developing Work in progress labels Mar 28, 2018
@skjnldsv
Copy link
Member Author

Failure unrelated (swift) and checker pass on restart! :)
LGTM 🚀

@MorrisJobke MorrisJobke merged commit 56fa44b into master Apr 3, 2018
@MorrisJobke MorrisJobke deleted the fix-files-copy-in-recent-favorites branch April 3, 2018 08:30
@MorrisJobke
Copy link
Member

@skjnldsv What about the backport?

@MorrisJobke
Copy link
Member

@skjnldsv What about the backport?

Ping ;)

@MorrisJobke
Copy link
Member

Backported in #9238

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: files high
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants