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

Added user merge #12685

Merged
merged 5 commits into from
Mar 17, 2023
Merged

Added user merge #12685

merged 5 commits into from
Mar 17, 2023

Conversation

snipe
Copy link
Owner

@snipe snipe commented Mar 17, 2023

This definitely can use some massaging, better logging, etc, but I have a particular need for it right now.

Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
@what-the-diff
Copy link

what-the-diff bot commented Mar 17, 2023

  • Added a new route for merging users
  • Added the merge view to confirm user merges
  • Updated language files with translations and added some more text in the views to explain what is happening when you try to merge users (this action cannot be undone)
  • Add an option into bulk actions dropdown on /users page that allows admins/superadmins to select multiple users at once, then choose "merge" from the dropdown menu, which will take them through a confirmation screen where they can pick one of those selected accounts as their master account before deleting all other ones (and moving assets etc over). This should only ever be used if there was bad data imported or synced somehow - it's not intended for normal use cases!

@snipe snipe merged commit f566a71 into develop Mar 17, 2023
@snipe snipe deleted the features/merge_users branch March 17, 2023 01:20
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.

None yet

1 participant