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.

Sign up for GitHub

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

Jump to bottom

Unify user update methods #28733

Merged
merged 12 commits into from
Feb 4, 2024
Merged

Unify user update methods #28733

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ef477dd
Unify user update methods.
KN4CK3R Jan 8, 2024
386fc5a
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto…
KN4CK3R Jan 8, 2024
89f71f6
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto…
KN4CK3R Jan 9, 2024
2b97dbc
Add suggestions.
KN4CK3R Jan 9, 2024
15b6e90
Fix return.
KN4CK3R Jan 9, 2024
d8d87b3
Fix test.
KN4CK3R Jan 9, 2024
84aa00e
Use `db.DeleteByID`.
KN4CK3R Jan 9, 2024
b50590e
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto…
KN4CK3R Jan 15, 2024
f339316
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto…
KN4CK3R Jan 26, 2024
f04b039
Merge branch 'main' into refactor-user-service
GiteaBot Feb 3, 2024
5792d59
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto…
KN4CK3R Feb 3, 2024
3550833
Merge branch 'main' into refactor-user-service
GiteaBot Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' of https://github.com/go-gitea/gitea into refacto… 
…r-user-service
  • Loading branch information
@KN4CK3R
KN4CK3R committed Jan 26, 2024
commit f339316f154748e3cb53cb2ad81b7b35aa66c6ec
9 changes: 7 additions & 2 deletions models/user/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,13 @@ func CreateUser(ctx context.Context, u *User, overwriteDefault ...*CreateUserOve
if u.Rands, err = GetUserSalt(); err != nil {
return err
}
if err = u.SetPassword(u.Passwd); err != nil {
return err
if u.Passwd != "" {
if err = u.SetPassword(u.Passwd); err != nil {
return err
}
} else {
u.Salt = ""
u.PasswdHashAlgo = ""
}

// save changes to database
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.