diff options
| author | Kousik Mitra <kousikmitra12@gmail.com> | 2020-04-19 02:02:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 04:32:53 +0800 |
| commit | 5a52ee75e37f36498a28e52023aa2959952f97bf (patch) | |
| tree | 5ffbec000209d7b1a806720f0ea541ef37623a6b /internal/db/user.go | |
| parent | c0fd6042fd56646f24275785faf5cd40ed8ab2c2 (diff) | |
db: remove `db.User.LoginType` field (#6122)
Diffstat (limited to 'internal/db/user.go')
| -rw-r--r-- | internal/db/user.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/internal/db/user.go b/internal/db/user.go index 7abdfc69..22f25b5d 100644 --- a/internal/db/user.go +++ b/internal/db/user.go @@ -53,10 +53,9 @@ type User struct { Name string `xorm:"UNIQUE NOT NULL" gorm:"NOT NULL"` FullName string // Email is the primary email address (to be used for communication) - Email string `xorm:"NOT NULL" gorm:"NOT NULL"` - Passwd string `xorm:"NOT NULL" gorm:"NOT NULL"` - LoginType LoginType // TODO: Remove me https://github.com/gogs/gogs/issues/6117. - LoginSource int64 `xorm:"NOT NULL DEFAULT 0" gorm:"NOT NULL;DEFAULT:0"` + Email string `xorm:"NOT NULL" gorm:"NOT NULL"` + Passwd string `xorm:"NOT NULL" gorm:"NOT NULL"` + LoginSource int64 `xorm:"NOT NULL DEFAULT 0" gorm:"NOT NULL;DEFAULT:0"` LoginName string Type UserType OwnedOrgs []*User `xorm:"-" gorm:"-" json:"-"` @@ -142,7 +141,7 @@ func (u *User) APIFormat() *api.User { // returns true if user login type is LoginPlain. func (u *User) IsLocal() bool { - return u.LoginType <= LoginPlain + return u.LoginSource <= 0 } // HasForkedRepo checks if user has already forked a repository with given ID. |