diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 6 | ||||
| -rw-r--r-- | models/user.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/models/pull.go b/models/pull.go index 2fe7d1fe..47d80473 100644 --- a/models/pull.go +++ b/models/pull.go @@ -525,11 +525,11 @@ func AddTestPullRequestTask(repoID int64, branch string) { } } -func ChangeUsernameInPullRequests(oldUserName, newUserName string) (error) { +func ChangeUsernameInPullRequests(oldUserName, newUserName string) error { pr := PullRequest{ - HeadUserName : newUserName, + HeadUserName: strings.ToLower(newUserName), } - _, err := x.Cols("head_user_name").Where("head_user_name = ?", oldUserName).Update(pr) + _, err := x.Cols("head_user_name").Where("head_user_name = ?", strings.ToLower(oldUserName)).Update(pr) return err } diff --git a/models/user.go b/models/user.go index 5d8075db..31ac1e22 100644 --- a/models/user.go +++ b/models/user.go @@ -599,12 +599,12 @@ func ChangeUserName(u *User, newUserName string) (err error) { return ErrUserAlreadyExist{newUserName} } - err = ChangeUsernameInPullRequests(u.LowerName, newUserName) + err = ChangeUsernameInPullRequests(u.Name, newUserName) if err != nil { - return err + return fmt.Errorf("ChangeUsernameInPullRequests: %v", err) } - return os.Rename(UserPath(u.LowerName), UserPath(newUserName)) + return os.Rename(UserPath(u.Name), UserPath(newUserName)) } func updateUser(e Engine, u *User) error { |