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

Add "Move" option for deleted items in the media tree #3914

Merged
merged 5 commits into from
Jan 17, 2019

Conversation

kjac
Copy link
Contributor

@kjac kjac commented Dec 20, 2018

Prerequisites

  • I have added steps to test this contribution in the description below

Description

This PR is the media tree equivalent to #3772. It adds move capability inline in the restore dialog if an item in the media tree can't be restored automatically to its original location.

Testing this PR

  1. Delete a folder with some items in it.
  2. Attempt to restore one of the items from the recycle bin.
  3. Verify that you're prompted to move it manually and that you can do so directly in the restore dialog.
  4. Attempt to restore the folder.
  5. Verify that the folder can be restored automatically to its original location in the tree.

It looks like this:

media-restore-move

🎄 20/24 🎄

@poornimanayar
Copy link
Contributor

Hi @kjac ,

Thanks! Lets test and get back to you :-)

Poornima

Copy link
Contributor

@poornimanayar poornimanayar left a comment

Choose a reason for hiding this comment

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

Works as advertised! Happy to approve

@kjac
Copy link
Contributor Author

kjac commented Dec 20, 2018

Yay 🎉

@nul800sebastiaan
Copy link
Member

Just found this one, I thought I'd merged this for v7 already 🙈 whoops!

I'll get to this soon but I need to talk to @Shazwazza about merging it, since we couldn't merge the content version of it.

@kjac
Copy link
Contributor Author

kjac commented Jan 13, 2019

Super. If by merging you mean to V8, I already promised to do it by hand @ #3931 😄

Update: PR for that in #4056

@nul800sebastiaan
Copy link
Member

Sweet, this all works as expected, thanks again @kjac !

@kjac
Copy link
Contributor Author

kjac commented Jan 17, 2019

Whoo! This paves the way for my next restore related changes 😋

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants