diff options
| author | Unknwon <joe2010xtmf@163.com> | 2015-02-11 21:58:37 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2015-02-11 21:58:37 -0500 |
| commit | 7e7160eefd6524013003d1c9668db4d358df5251 (patch) | |
| tree | 4ca5963cfb5c0dbe8e806942cdf8d6997580a6f0 /models/user.go | |
| parent | c5c467a9cd805c7cd0fb93f467e0205ee082cca3 (diff) | |
| download | gitea-7e7160eefd6524013003d1c9668db4d358df5251.tar.gz gitea-7e7160eefd6524013003d1c9668db4d358df5251.zip | |
first pass work on migration #925
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/models/user.go b/models/user.go index 2da0881c81..5606cea379 100644 --- a/models/user.go +++ b/models/user.go @@ -415,7 +415,8 @@ func ChangeUserName(u *User, newUserName string) (err error) { if strings.HasPrefix(accesses[i].RepoName, u.LowerName+"/") { accesses[i].RepoName = strings.Replace(accesses[i].RepoName, u.LowerName, newUserName, 1) } - if err = UpdateAccessWithSession(sess, &accesses[i]); err != nil { + if err = updateAccess(sess, &accesses[i]); err != nil { + sess.Rollback() return err } } @@ -435,7 +436,8 @@ func ChangeUserName(u *User, newUserName string) (err error) { // if the access is not the user's access (already updated above) if accesses[j].UserName != u.LowerName { accesses[j].RepoName = newUserName + "/" + repos[i].LowerName - if err = UpdateAccessWithSession(sess, &accesses[j]); err != nil { + if err = updateAccess(sess, &accesses[j]); err != nil { + sess.Rollback() return err } } @@ -564,8 +566,7 @@ func UserPath(userName string) string { func GetUserByKeyId(keyId int64) (*User, error) { user := new(User) - rawSql := "SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?" - has, err := x.Sql(rawSql, keyId).Get(user) + has, err := x.Sql("SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?", keyId).Get(user) if err != nil { return nil, err } else if !has { |