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

Fix #5351 - Redirection with page params after copy emoji #5387

Merged
merged 2 commits into from
Oct 14, 2017

Conversation

tkbky
Copy link
Contributor

@tkbky tkbky commented Oct 14, 2017

What

As reported in #5351, on admin panel, when copy an emoji (non-local emoji) in the Custom Emoji section and it's on page > 1, it always redirect back to page 1 regardless of whether it's successful/fail. This change fixes that.

Why

It's an inconvenience when trying to copy multiple emojis located on page > 1.

Other possible issues

The same inconvenience happens on the other actions on CustomEmojisController, such as #copy, #enable & #disable

@Gargron
Copy link
Member

Gargron commented Oct 14, 2017

Have you tested if this works? Because I don't think the copy method receives a :page param, you would need to add it to the link_to - unless I am mistaken

@tkbky
Copy link
Contributor Author

tkbky commented Oct 14, 2017

@Gargron you're right. 😅 Embarrassingly, I miss it when I commit.

@tkbky tkbky closed this Oct 14, 2017
@tkbky tkbky deleted the bugfix/copy-custom-emoji-redirect branch October 14, 2017 01:28
@tkbky tkbky restored the bugfix/copy-custom-emoji-redirect branch October 14, 2017 01:29
@tkbky tkbky reopened this Oct 14, 2017
@Gargron Gargron merged commit 1bdd694 into mastodon:master Oct 14, 2017
cobodo pushed a commit to cobodo/mastodon that referenced this pull request Oct 20, 2017
…stodon#5387)

* Fix mastodon#5351 - Redirection with page params after copy emoji

* Add page params to copy emoji link
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants