diff options
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/models/user.go b/models/user.go index ce85008b..31f4a289 100644 --- a/models/user.go +++ b/models/user.go @@ -67,6 +67,7 @@ type User struct { Website string IsActive bool IsAdmin bool + AllowGitHook bool Rands string `xorm:"VARCHAR(10)"` Salt string `xorm:"VARCHAR(10)"` Created time.Time `xorm:"CREATED"` @@ -100,7 +101,7 @@ func (u *User) AvatarLink() string { } else if setting.Service.EnableCacheAvatar { return setting.AppSubUrl + "/avatar/" + u.Avatar } - return "//1.gravatar.com/avatar/" + u.Avatar + return setting.GravatarSource + u.Avatar } // NewGitSig generates and returns the signature of given user. @@ -376,7 +377,7 @@ func UpdateUser(u *User) error { return err } -// TODO: need some kind of mechanism to record failure. +// FIXME: need some kind of mechanism to record failure. HINT: system notice // DeleteUser completely and permanently deletes everything of user. func DeleteUser(u *User) error { // Check ownership of repository. @@ -390,13 +391,13 @@ func DeleteUser(u *User) error { // Check membership of organization. count, err = u.GetOrganizationCount() if err != nil { - return errors.New("modesl.GetRepositories(GetOrganizationCount): " + err.Error()) + return errors.New("GetOrganizationCount: " + err.Error()) } else if count > 0 { return ErrUserHasOrgs } - // TODO: check issues, other repos' commits - // TODO: roll backable in some point. + // FIXME: check issues, other repos' commits + // FIXME: roll backable in some point. // Delete all followers. if _, err = x.Delete(&Follow{FollowId: u.Id}); err != nil { @@ -581,7 +582,7 @@ func SearchUserByName(opt SearchOption) (us []*User, err error) { opt.Keyword = strings.ToLower(opt.Keyword) us = make([]*User, 0, opt.Limit) - err = x.Limit(opt.Limit).Where("type=0").And("lower_name like '%" + opt.Keyword + "%'").Find(&us) + err = x.Limit(opt.Limit).Where("type=0").And("lower_name like ?", "%"+opt.Keyword+"%").Find(&us) return us, err } |