@@ -65,14 +65,12 @@ func (org *User) GetMembers() error {
65
65
return err
66
66
}
67
67
68
- org . Members = make ([]* User , len (ous ))
68
+ var ids = make ([]int64 , len (ous ))
69
69
for i , ou := range ous {
70
- org .Members [i ], err = GetUserByID (ou .Uid )
71
- if err != nil {
72
- return err
73
- }
70
+ ids [i ] = ou .Uid
74
71
}
75
- return nil
72
+ org .Members , err = GetUsersByIDs (ids )
73
+ return err
76
74
}
77
75
78
76
// AddMember adds new member to organization.
@@ -190,7 +188,7 @@ func CountOrganizations() int64 {
190
188
// Organizations returns number of organizations in given page.
191
189
func Organizations (page , pageSize int ) ([]* User , error ) {
192
190
orgs := make ([]* User , 0 , pageSize )
193
- return orgs , x .Limit (pageSize , (page - 1 )* pageSize ).Where ("type=1" ).Asc ("id " ).Find (& orgs )
191
+ return orgs , x .Limit (pageSize , (page - 1 )* pageSize ).Where ("type=1" ).Asc ("name " ).Find (& orgs )
194
192
}
195
193
196
194
// DeleteOrganization completely and permanently deletes everything of organization.
@@ -260,8 +258,11 @@ func getOrgsByUserID(sess *xorm.Session, userID int64, showAll bool) ([]*User, e
260
258
if ! showAll {
261
259
sess .And ("`org_user`.is_public=?" , true )
262
260
}
263
- return orgs , sess .And ("`org_user`.uid=?" , userID ).
264
- Join ("INNER" , "`org_user`" , "`org_user`.org_id=`user`.id" ).Find (& orgs )
261
+ return orgs , sess .
262
+ And ("`org_user`.uid=?" , userID ).
263
+ Join ("INNER" , "`org_user`" , "`org_user`.org_id=`user`.id" ).
264
+ Asc ("`user`.name" ).
265
+ Find (& orgs )
265
266
}
266
267
267
268
// 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
278
279
279
280
func getOwnedOrgsByUserID (sess * xorm.Session , userID int64 ) ([]* User , error ) {
280
281
orgs := make ([]* User , 0 , 10 )
281
- return orgs , sess .Where ("`org_user`.uid=?" , userID ).And ("`org_user`.is_owner=?" , true ).
282
- Join ("INNER" , "`org_user`" , "`org_user`.org_id=`user`.id" ).Find (& orgs )
282
+ return orgs , sess .
283
+ Where ("`org_user`.uid=?" , userID ).
284
+ And ("`org_user`.is_owner=?" , true ).
285
+ Join ("INNER" , "`org_user`" , "`org_user`.org_id=`user`.id" ).
286
+ Asc ("`user`.name" ).
287
+ Find (& orgs )
283
288
}
284
289
285
290
// GetOwnedOrgsByUserID returns a list of organizations are owned by given user ID.
@@ -298,12 +303,16 @@ func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
298
303
// GetOrgUsersByUserID returns all organization-user relations by user ID.
299
304
func GetOrgUsersByUserID (uid int64 , all bool ) ([]* OrgUser , error ) {
300
305
ous := make ([]* OrgUser , 0 , 10 )
301
- sess := x .Where ("uid=?" , uid )
306
+ sess := x .
307
+ Join ("LEFT" , "user" , `"org_user".org_id="user".id` ).
308
+ Where (`"org_user".uid=?` , uid )
302
309
if ! all {
303
310
// Only show public organizations
304
311
sess .And ("is_public=?" , true )
305
312
}
306
- err := sess .Find (& ous )
313
+ err := sess .
314
+ Asc ("`user`.name" ).
315
+ Find (& ous )
307
316
return ous , err
308
317
}
309
318
@@ -450,10 +459,14 @@ func RemoveOrgRepo(orgID, repoID int64) error {
450
459
451
460
func (org * User ) getUserTeams (e Engine , userID int64 , cols ... string ) ([]* Team , error ) {
452
461
teams := make ([]* Team , 0 , org .NumTeams )
453
- return teams , e .Where ("team_user.org_id = ?" , org .ID ).
454
- And ("team_user.uid = ?" , userID ).
455
- Join ("INNER" , "team_user" , "team_user.team_id = team.id" ).
456
- Cols (cols ... ).Find (& teams )
462
+ return teams , e .
463
+ Where ("`team_user`.org_id = ?" , org .ID ).
464
+ Join ("INNER" , "team_user" , "`team_user`.team_id = team.id" ).
465
+ Join ("INNER" , "user" , "`user`.id=team_user.uid" ).
466
+ And ("`team_user`.uid = ?" , userID ).
467
+ Asc ("`user`.name" ).
468
+ Cols (cols ... ).
469
+ Find (& teams )
457
470
}
458
471
459
472
// GetUserTeamIDs returns of all team IDs of the organization that user is memeber of.
0 commit comments