summaryrefslogtreecommitdiffstats
path: root/models/user.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2016-11-10 16:56:36 +0800
committerGitHub <noreply@github.com>2016-11-10 16:56:36 +0800
commitb5bfab98552a1f9fb03f4f4246ce4772cbc343eb (patch)
treeefdf44a7b7d5461f9795dc76bd0150bcc788bee7 /models/user.go
parent145648a2334ea4583cb51f2e95df2df366b17416 (diff)
parent3a10a0c1ca4915db6323836fcc47e92500232714 (diff)
downloadgitea-b5bfab98552a1f9fb03f4f4246ce4772cbc343eb.tar.gz
gitea-b5bfab98552a1f9fb03f4f4246ce4772cbc343eb.zip
Merge pull request #130 from 0xbaadf00d/feature/ordering-org-user
Ordering organizations and users by name
Diffstat (limited to 'models/user.go')
-rw-r--r--models/user.go9
1 files changed, 8 insertions, 1 deletions
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))