mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
refactor: append, build variable and type switch (#4940)
* refactor: append, build variable and type switch * fix: remove redundant space.
This commit is contained in:
@@ -43,8 +43,7 @@ func TestUpdateAssignee(t *testing.T) {
|
||||
assert.NoError(t, err)
|
||||
|
||||
var expectedAssignees []*User
|
||||
expectedAssignees = append(expectedAssignees, user2)
|
||||
expectedAssignees = append(expectedAssignees, user3)
|
||||
expectedAssignees = append(expectedAssignees, user2, user3)
|
||||
|
||||
for in, assignee := range assignees {
|
||||
assert.Equal(t, assignee.ID, expectedAssignees[in].ID)
|
||||
|
@@ -83,7 +83,7 @@ func addMultipleAssignees(x *xorm.Engine) error {
|
||||
return err
|
||||
}
|
||||
|
||||
allIssues := []Issue{}
|
||||
allIssues := []*Issue{}
|
||||
if err := sess.Find(&allIssues); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -104,7 +104,7 @@ func addMultipleAssignees(x *xorm.Engine) error {
|
||||
return err
|
||||
}
|
||||
|
||||
allAssignementComments := []Comment{}
|
||||
allAssignementComments := []*Comment{}
|
||||
if err := sess.Where("type = ?", 9).Find(&allAssignementComments); err != nil {
|
||||
return err
|
||||
}
|
||||
|
@@ -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)
|
||||
}
|
||||
|
Reference in New Issue
Block a user