Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-23 16:50:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

models/org: reduce to 2 SQL executions for GetOrgIDsByUserID

Browse Source 
This also addresses #4231. It is now ignoring nonexistent
organizations returned from 'org_user' table.
This was a bug caused in older version that didn't cleanup
'org_user' table when delete an organization.
This commit is contained in:
Unknwon
2017-03-03 18:26:51 -05:00
parent f7b7d008b6
commit ebd95dd082
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@@ -16,7 +16,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.10.4.0302" const APP_VER = "0.10.4.0303"
func init() { func init() {
setting.AppVer = APP_VER setting.AppVer = APP_VER

17
models/org.go
View File

@@ -303,16 +303,15 @@ func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
return getOwnedOrgsByUserID(sess.Desc(desc), userID) return getOwnedOrgsByUserID(sess.Desc(desc), userID)
} }
// GetOrgUsersByUserID returns all organization-user relations by user ID. // GetOrgIDsByUserID returns a list of organization IDs that user belongs to.
func GetOrgUsersByUserID(uid int64, all bool) ([]*OrgUser, error) { // The showPrivate indicates whether to include private memberships.
ous := make([]*OrgUser, 0, 10) func GetOrgIDsByUserID(userID int64, showPrivate bool) ([]int64, error) {
sess := x.Where("uid=?", uid) orgIDs := make([]int64, 0, 5)
if !all { sess := x.Table("org_user").Where("uid = ?", userID)
// Only show public organizations if !showPrivate {
sess.And("is_public=?", true) sess.And("is_public = ?", true)
} }
err := sess.Find(&ous) return orgIDs, sess.Distinct("org_id").Find(&orgIDs)
return ous, err
} }
func getOrgUsersByOrgID(e Engine, orgID int64) ([]*OrgUser, error) { func getOrgUsersByOrgID(e Engine, orgID int64) ([]*OrgUser, error) {

13
models/user.go
View File

@@ -448,19 +448,16 @@ func (u *User) GetOwnedOrganizations() (err error) {
} }
// GetOrganizations returns all organizations that user belongs to. // GetOrganizations returns all organizations that user belongs to.
func (u *User) GetOrganizations(all bool) error { func (u *User) GetOrganizations(showPrivate bool) error {
ous, err := GetOrgUsersByUserID(u.ID, all) orgIDs, err := GetOrgIDsByUserID(u.ID, showPrivate)
if err != nil { if err != nil {
return err return fmt.Errorf("GetOrgIDsByUserID: %v", err)
} }
u.Orgs = make([]*User, len(ous)) u.Orgs = make([]*User, 0, len(orgIDs))
for i, ou := range ous { if err = x.In("id", orgIDs).Find(&u.Orgs); err != nil {
u.Orgs[i], err = GetUserByID(ou.OrgID)
if err != nil {
return err return err
} }
}
return nil return nil
} }

2
templates/.VERSION
View File

@@ -1 +1 @@
0.10.4.0302 0.10.4.0303