fix forgot removed records when deleting user #5429
Merged
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
lafriks
approved these changes
Nov 29, 2018
bkcsoft
added
the
lgtm/need 1
|
@lunny looks like xorm update has broken our unit tests.. |
|
@lafriks yes, will fix that. |
lunny
force-pushed
the
lunny/fix_delete_user
branch
from
f2be1a4 to
85951fc
Compare
Codecov Report
@@ Coverage Diff @@
## master #5429 +/- ##
=========================================
Coverage ? 37.62%
=========================================
Files ? 320
Lines ? 46974
Branches ? 0
=========================================
Hits ? 17673
Misses ? 26791
Partials ? 2510
Continue to review full report at Codecov.
|
|
@lafriks fixed. |
|
Conflicts. |
lunny
force-pushed
the
lunny/fix_delete_user
branch
2 times, most recently
from
91bba2d to
18bdf78
Compare
zeripath
reviewed
Dec 17, 2018
| return fmt.Errorf("deletePublicKeys: %v", err) | ||
| } | ||
| rewriteAllPublicKeys(e) | ||
| // ***** END: PublicKey ***** |
There was a problem hiding this comment.
RewriteAllPublicKeys is called at the end of DeleteUser too, does it still need to be called there?
zeripath
reviewed
Dec 17, 2018
models/user.go
Outdated
| @@ -1087,6 +1088,7 @@ func DeleteUser(u *User) (err error) { | |||
| if err = sess.Commit(); err != nil { | |||
| return err | |||
| } | |||
| sess.Close() | |||
|
|
|||
| return RewriteAllPublicKeys() | |||
lunny
force-pushed
the
lunny/fix_delete_user
branch
from
18bdf78 to
8c20637
Compare
|
@zeripath Good catch. Done. |
zeripath
approved these changes
Dec 18, 2018
bkcsoft
added
lgtm/done
|
@lunny Does this need backporting? |
lunny
added
backport/done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Will fix #5356 and replace #5357 , also update xorm to latest stable version.