fix: delete old user notification settings when merging users (backport #26604) #26619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
(cherry picked from commit e97a56b)
mergify
bot
requested review from
a team and
ankush
and removed request for
a team
github-actions
bot
added
the
add-test-cases
frappe-pr-bot
pushed a commit
that referenced
this pull request
Jun 4, 2024
## [15.29.1](v15.29.0...v15.29.1) (2024-06-04) ### Bug Fixes * **address_query:** show search fields in description if set ([4db0b53](4db0b53)) * **address_query:** use title field if set ([01a00e3](01a00e3)) * allow creation of workspace based on desk role perms ([fb898f7](fb898f7)) * Auto Email Report not working when Add Total Row is enabled ([#26668](#26668)) ([e585657](e585657)) * Avoid concurrent TODO updates ([#26594](#26594)) ([cee96b9](cee96b9)) * bypass IP restriction for the methods required for our socketio backend ([42011c9](42011c9)) * **checkbox:** Fix checkbox size on small screens ([#26596](#26596)) ([#26612](#26612)) ([fc2a852](fc2a852)) * delete old user notification settings when merging users ([#26604](#26604)) ([#26619](#26619)) ([af1a47d](af1a47d)) * don't copy "Standard" on dashboard chart (backport [#26649](#26649)) ([#26651](#26651)) ([719522d](719522d)) * front-end bug in 'customize_form.js', triggered by delete actions on child-tables ([#26344](#26344)) ([b9f4845](b9f4845)), closes [#26041](#26041) [#26041](https://github.com/frappe/issues/26041) [#26041](#26041) * kanban filters fixes ([#26605](#26605)) ([#26610](#26610)) ([af7f550](af7f550)) * **link-preview:** Correct synchronization of preview data on change. ([#26641](#26641)) ([#26654](#26654)) ([c34c1d1](c34c1d1)) * **make_request:** don't blindly try to check the content-type ([2fc914f](2fc914f)) * **number_card:** ensure value is returned ([0a91f04](0a91f04)) * **UX:** multi-tab experience ([#26309](#26309)) ([#26646](#26646)) ([3e4fff7](3e4fff7)) ### Performance Improvements * memory leak on kanban refresh ([#26597](#26597)) ([#26599](#26599)) ([8b8a297](8b8a297)) * rearrange some frequent jobs ([#26591](#26591)) ([#26603](#26603)) ([d9b7d73](d9b7d73))
|
🎉 This PR is included in version 15.29.1 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This pull request fixes an issue where merging users in the Frappe framework resulted in an error due to existing notification settings for the user being merged. The change ensures that the old user's notification settings are deleted during the merge process, preventing conflicts and allowing the merge to be completed successfully.
Detailed Explanation
Issue:
When attempting to merge two users, an error was encountered if the user being merged had existing notification settings. For example, merging
user2(user2@example.com) intouser1(user1@example.com) would fail with the following error:Error Traceback