diff options
| author | Bo-Yi Wu <appleboy.tw@gmail.com> | 2019-05-28 23:45:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-28 23:45:54 +0800 |
| commit | 743697a549bda16508ab961ac79a8bc5bdca3bbd (patch) | |
| tree | 23d40a210acd7b84dd62f6c5ec73dfea938faa5f /models/user.go | |
| parent | 31557b12744410633ceb6fc12b53fb09038cee35 (diff) | |
| download | gitea-743697a549bda16508ab961ac79a8bc5bdca3bbd.tar.gz gitea-743697a549bda16508ab961ac79a8bc5bdca3bbd.zip | |
refactor: append, build variable and type switch (#4940)
* refactor: append, build variable and type switch
* fix: remove redundant space.
Diffstat (limited to 'models/user.go')
| -rw-r--r-- | models/user.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/models/user.go b/models/user.go index f57c5a615d..9ee27ddfbd 100644 --- a/models/user.go +++ b/models/user.go @@ -13,9 +13,7 @@ import ( "encoding/hex" "errors" "fmt" - - // Needed for jpeg support - _ "image/jpeg" + _ "image/jpeg" // Needed for jpeg support "image/png" "os" "path/filepath" @@ -1622,7 +1620,7 @@ func SyncExternalUsers() { var sshKeysNeedUpdate bool // Find all users with this login type - var users []User + var users []*User x.Where("login_type = ?", LoginLDAP). And("login_source = ?", s.ID). Find(&users) @@ -1641,7 +1639,7 @@ func SyncExternalUsers() { // Search for existing user for _, du := range users { if du.LowerName == strings.ToLower(su.Username) { - usr = &du + usr = du break } } @@ -1724,7 +1722,7 @@ func SyncExternalUsers() { log.Trace("SyncExternalUsers[%s]: Deactivating user %s", s.Name, usr.Name) usr.IsActive = false - err = UpdateUserCols(&usr, "is_active") + err = UpdateUserCols(usr, "is_active") if err != nil { log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", s.Name, usr.Name, err) } |