aboutsummaryrefslogtreecommitdiff
path: root/models/user.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-06 02:21:44 -0500
committerUnknown <joe2010xtmf@163.com>2014-03-06 02:21:44 -0500
commitc6f2c23b05474d80ea282a7683135b3ea8f8e2d9 (patch)
tree83054b7cb334ffbfbeadc688bf853fa0916696d3 /models/user.go
parente59f90b8fee3e615d1b60067bfc0d636606899d8 (diff)
Add binding form for register user
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go15
1 files changed, 6 insertions, 9 deletions
diff --git a/models/user.go b/models/user.go
index 82059738..d8469251 100644
--- a/models/user.go
+++ b/models/user.go
@@ -15,7 +15,6 @@ import (
"github.com/dchest/scrypt"
"github.com/gogits/gogs/utils"
- "github.com/gogits/gogs/utils/log"
)
// User types.
@@ -100,17 +99,15 @@ func RegisterUser(user *User) (err error) {
user.LowerName = strings.ToLower(user.Name)
user.Avatar = utils.EncodeMd5(user.Email)
user.EncodePasswd()
- _, err = orm.Insert(user)
- if err != nil {
+ if _, err = orm.Insert(user); err != nil {
return err
}
- err = os.MkdirAll(UserPath(user.Name), os.ModePerm)
- if err != nil {
- _, err2 := orm.Id(user.Id).Delete(&User{})
- if err2 != nil {
- log.Error("create userpath %s failed and delete table record faild",
- user.Name)
+ if err = os.MkdirAll(UserPath(user.Name), os.ModePerm); err != nil {
+
+ if _, err := orm.Id(user.Id).Delete(&User{}); err != nil {
+ return errors.New(fmt.Sprintf(
+ "both create userpath %s and delete table record faild", user.Name))
}
return err
}