Skip to content

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

Merged
MorrisJobke merged 1 commit into
masterfrom
fix-files-copy-in-recent-favorites
Apr 3, 2018
Merged

Fixed files copy/move when in favorites or recent section#8945
MorrisJobke merged 1 commit into
masterfrom
fix-files-copy-in-recent-favorites

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Mar 22, 2018

Copy link
Copy Markdown
Member

@skjnldsvskjnldsv added this to the Nextcloud 14 milestone Mar 22, 2018
@skjnldsvskjnldsv self-assigned this Mar 22, 2018
tcitworld
tcitworld reviewed Mar 22, 2018
View reviewed changes
Comment threadapps/files/js/fileactions.js
}
if (type === OC.dialogs.FILEPICKER_TYPE_MOVE) {
context.fileList.move(filename, targetPath);
context.fileList.move(filename, targetPath, false, context.dir);

@tcitworldtcitworldMar 22, 2018

Copy link
Copy Markdown
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

@skjnldsvskjnldsvMar 22, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

facepalm

@skjnldsvskjnldsvMar 22, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Don't judge me ^^'

@tcitworldtcitworldMar 22, 2018

Copy link
Copy Markdown
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 ;)

@windoyblankwindoyblankMar 26, 2018

Copy link
Copy Markdown

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

@skjnldsvskjnldsvMar 26, 2018

Copy link
Copy Markdown
MemberAuthor

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?

@windoyblankwindoyblankMar 26, 2018

Copy link
Copy Markdown

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.

@skjnldsvskjnldsvMar 26, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Thanks! :)
let me try!

@skjnldsvskjnldsvMar 28, 2018

Copy link
Copy Markdown
MemberAuthor

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!

@windoyblankwindoyblankApr 16, 2018

Copy link
Copy Markdown

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.

@skjnldsv
Fixed files copy/move when in favorites or recent section
24ecf3f
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
skjnldsvforce-pushed the fix-files-copy-in-recent-favorites branch from 5c24e1b to 24ecf3fCompareMarch 22, 2018 17:09
@codecov

codecovBot commented Mar 22, 2018

Copy link
Copy Markdown

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 FilesCoverage ΔComplexity Δ
apps/files_trashbin/lib/Expiration.php90.32% <0%> (-1.62%)29% <0%> (ø)
lib/private/Files/Node/Folder.php89.25% <0%> (ø)61% <0%> (-1%)⬇️
apps/files_trashbin/lib/Trashbin.php72.7% <0%> (+0.24%)136% <0%> (ø)⬇️
lib/private/Files/ObjectStore/SwiftFactory.php52% <0%> (+52%)37% <0%> (ø)⬇️
lib/private/Files/ObjectStore/Swift.php72.41% <0%> (+72.41%)9% <0%> (ø)⬇️

MorrisJobke
MorrisJobke approved these changes Mar 23, 2018
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

@skjnldsvskjnldsv 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

skjnldsv commented Mar 28, 2018

Copy link
Copy Markdown
MemberAuthor

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

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

MorrisJobke commented Apr 16, 2018

Copy link
Copy Markdown
Member

@skjnldsv What about the backport?

@MorrisJobke

MorrisJobke commented Apr 18, 2018

Copy link
Copy Markdown
Member

@skjnldsv What about the backport?

Ping ;)

This was referenced Apr 18, 2018
Merged
Merged
@MorrisJobke

MorrisJobke commented Apr 18, 2018

Copy link
Copy Markdown
Member

Backported in #9238

@danxuliudanxuliu mentioned this pull request Apr 18, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tcitworldtcitworldtcitworld left review comments
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst
+1 more reviewer
@windoyblankwindoyblankwindoyblank left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@skjnldsvskjnldsv

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: fileshigh

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

5 participants

@skjnldsv@MorrisJobke@tcitworld@juliusknorr@windoyblank