diff options
| -rw-r--r-- | models/org.go | 47 | ||||
| -rw-r--r-- | models/user.go | 9 | ||||
| -rw-r--r-- | routers/admin/repos.go | 2 | ||||
| -rw-r--r-- | routers/home.go | 4 |
4 files changed, 41 insertions, 21 deletions
diff --git a/models/org.go b/models/org.go index 9583e20927..621e48de2f 100644 --- a/models/org.go +++ b/models/org.go @@ -65,14 +65,12 @@ func (org *User) GetMembers() error { return err } - org.Members = make([]*User, len(ous)) + var ids = make([]int64, len(ous)) for i, ou := range ous { - org.Members[i], err = GetUserByID(ou.Uid) - if err != nil { - return err - } + ids[i] = ou.Uid } - return nil + org.Members, err = GetUsersByIDs(ids) + return err } // AddMember adds new member to organization. @@ -190,7 +188,7 @@ func CountOrganizations() int64 { // Organizations returns number of organizations in given page. func Organizations(page, pageSize int) ([]*User, error) { orgs := make([]*User, 0, pageSize) - return orgs, x.Limit(pageSize, (page-1)*pageSize).Where("type=1").Asc("id").Find(&orgs) + return orgs, x.Limit(pageSize, (page-1)*pageSize).Where("type=1").Asc("name").Find(&orgs) } // DeleteOrganization completely and permanently deletes everything of organization. @@ -260,8 +258,11 @@ func getOrgsByUserID(sess *xorm.Session, userID int64, showAll bool) ([]*User, e if !showAll { sess.And("`org_user`.is_public=?", true) } - return orgs, sess.And("`org_user`.uid=?", userID). - Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").Find(&orgs) + return orgs, sess. + And("`org_user`.uid=?", userID). + Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id"). + Asc("`user`.name"). + Find(&orgs) } // GetOrgsByUserID returns a list of organizations that the given user ID @@ -278,8 +279,12 @@ func GetOrgsByUserIDDesc(userID int64, desc string, showAll bool) ([]*User, erro func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) { orgs := make([]*User, 0, 10) - return orgs, sess.Where("`org_user`.uid=?", userID).And("`org_user`.is_owner=?", true). - Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").Find(&orgs) + return orgs, sess. + Where("`org_user`.uid=?", userID). + And("`org_user`.is_owner=?", true). + Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id"). + Asc("`user`.name"). + Find(&orgs) } // GetOwnedOrgsByUserID returns a list of organizations are owned by given user ID. @@ -298,12 +303,16 @@ func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) { // GetOrgUsersByUserID returns all organization-user relations by user ID. func GetOrgUsersByUserID(uid int64, all bool) ([]*OrgUser, error) { ous := make([]*OrgUser, 0, 10) - sess := x.Where("uid=?", uid) + sess := x. + Join("LEFT", "user", `"org_user".org_id="user".id`). + Where(`"org_user".uid=?`, uid) if !all { // Only show public organizations sess.And("is_public=?", true) } - err := sess.Find(&ous) + err := sess. + Asc("`user`.name"). + Find(&ous) return ous, err } @@ -450,10 +459,14 @@ func RemoveOrgRepo(orgID, repoID int64) error { func (org *User) getUserTeams(e Engine, userID int64, cols ...string) ([]*Team, error) { teams := make([]*Team, 0, org.NumTeams) - return teams, e.Where("team_user.org_id = ?", org.ID). - And("team_user.uid = ?", userID). - Join("INNER", "team_user", "team_user.team_id = team.id"). - Cols(cols...).Find(&teams) + return teams, e. + Where("`team_user`.org_id = ?", org.ID). + Join("INNER", "team_user", "`team_user`.team_id = team.id"). + Join("INNER", "user", "`user`.id=team_user.uid"). + And("`team_user`.uid = ?", userID). + Asc("`user`.name"). + Cols(cols...). + Find(&teams) } // GetUserTeamIDs returns of all team IDs of the organization that user is memeber of. diff --git a/models/user.go b/models/user.go index 3870bdeb5a..8ede2181bb 100644 --- a/models/user.go +++ b/models/user.go @@ -578,7 +578,7 @@ func CountUsers() int64 { // Users returns number of users in given page. func Users(page, pageSize int) ([]*User, error) { users := make([]*User, 0, pageSize) - return users, x.Limit(pageSize, (page-1)*pageSize).Where("type=0").Asc("id").Find(&users) + return users, x.Limit(pageSize, (page-1)*pageSize).Where("type=0").Asc("name").Find(&users) } // get user by erify code @@ -923,6 +923,13 @@ func GetUserEmailsByNames(names []string) []string { return mails } +// GetUsersByIDs returns all resolved users from a list of Ids. +func GetUsersByIDs(ids []int64) ([]*User, error) { + ous := make([]*User, 0, len(ids)) + err := x.In("id", ids).Asc("name").Find(&ous) + return ous, err +} + // GetUserIDsByNames returns a slice of ids corresponds to names. func GetUserIDsByNames(names []string) []int64 { ids := make([]int64, 0, len(names)) diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 2c32070ed3..d19b01c4cb 100644 --- a/routers/admin/repos.go +++ b/routers/admin/repos.go @@ -27,7 +27,7 @@ func Repos(ctx *context.Context) { Ranger: models.Repositories, Private: true, PageSize: setting.UI.Admin.RepoPagingNum, - OrderBy: "id ASC", + OrderBy: "owner_id ASC, name ASC, id ASC", TplName: REPOS, }) } diff --git a/routers/home.go b/routers/home.go index 2dd223b748..071a870cf3 100644 --- a/routers/home.go +++ b/routers/home.go @@ -176,7 +176,7 @@ func ExploreUsers(ctx *context.Context) { Counter: models.CountUsers, Ranger: models.Users, PageSize: setting.UI.ExplorePagingNum, - OrderBy: "updated_unix DESC", + OrderBy: "name ASC", TplName: EXPLORE_USERS, }) } @@ -191,7 +191,7 @@ func ExploreOrganizations(ctx *context.Context) { Counter: models.CountOrganizations, Ranger: models.Organizations, PageSize: setting.UI.ExplorePagingNum, - OrderBy: "updated_unix DESC", + OrderBy: "name ASC", TplName: EXPLORE_ORGANIZATIONS, }) } |