Browse Source

Replace calls to xorm UseBool with Where (#2237)

tags/v1.2.0-rc1
G Lunny Xiao 7 years ago
parent
commit
db79619165
2 changed files with 4 additions and 9 deletions
  1. +1
    -1
      models/login_source.go
  2. +3
    -8
      models/oauth2.go

+ 1
- 1
models/login_source.go View File

@@ -677,7 +677,7 @@ func UserSignIn(username, password string) (*User, error) {
} }


sources := make([]*LoginSource, 0, 5) sources := make([]*LoginSource, 0, 5)
if err = x.UseBool().Find(&sources, &LoginSource{IsActived: true}); err != nil {
if err = x.Where("is_actived = ?", true).Find(&sources); err != nil {
return nil, err return nil, err
} }




+ 3
- 8
models/oauth2.go View File

@@ -56,7 +56,7 @@ var OAuth2DefaultCustomURLMappings = map[string]*oauth2.CustomURLMapping{
// GetActiveOAuth2ProviderLoginSources returns all actived LoginOAuth2 sources // GetActiveOAuth2ProviderLoginSources returns all actived LoginOAuth2 sources
func GetActiveOAuth2ProviderLoginSources() ([]*LoginSource, error) { func GetActiveOAuth2ProviderLoginSources() ([]*LoginSource, error) {
sources := make([]*LoginSource, 0, 1) sources := make([]*LoginSource, 0, 1)
if err := x.UseBool().Find(&sources, &LoginSource{IsActived: true, Type: LoginOAuth2}); err != nil {
if err := x.Where("is_actived = ? and type = ?", true, LoginOAuth2).Find(&sources); err != nil {
return nil, err return nil, err
} }
return sources, nil return sources, nil
@@ -64,13 +64,8 @@ func GetActiveOAuth2ProviderLoginSources() ([]*LoginSource, error) {


// GetActiveOAuth2LoginSourceByName returns a OAuth2 LoginSource based on the given name // GetActiveOAuth2LoginSourceByName returns a OAuth2 LoginSource based on the given name
func GetActiveOAuth2LoginSourceByName(name string) (*LoginSource, error) { func GetActiveOAuth2LoginSourceByName(name string) (*LoginSource, error) {
loginSource := &LoginSource{
Name: name,
Type: LoginOAuth2,
IsActived: true,
}

has, err := x.UseBool().Get(loginSource)
loginSource := new(LoginSource)
has, err := x.Where("name = ? and type = ? and is_actived = ?", name, LoginOAuth2, true).Get(loginSource)
if !has || err != nil { if !has || err != nil {
return nil, err return nil, err
} }


Loading…
Cancel
Save