MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-26 01:42:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2527 from fnkr/hide-private-orgs-from-profile

Browse source 
Show all orgs on user profile, except the private one's
This commit is contained in:
Unknwon 2016-01-31 08:56:21 -05:00
commit 1c1246fcb9
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
models/org.go
View file

@ -253,6 +253,26 @@ func IsPublicMembership(orgId, uid int64) bool {
return has
}
func getPublicOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
orgs := make([]*User, 0, 10)
return orgs, sess.Where("`org_user`.uid=?", userID).And("`org_user`.is_public=?", true).
Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").Find(&orgs)
}
// GetPublicOrgsByUserID returns a list of organizations that the given user ID
// has joined publicly.
func GetPublicOrgsByUserID(userID int64) ([]*User, error) {
sess := x.NewSession()
return getPublicOrgsByUserID(sess, userID)
}
// GetPublicOrgsByUserID returns a list of organizations that the given user ID
// has joined publicly, ordered descending by the given condition.
func GetPublicOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
sess := x.NewSession()
return getPublicOrgsByUserID(sess.Desc(desc), userID)
}
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).
@ -266,7 +286,7 @@ func GetOwnedOrgsByUserID(userID int64) ([]*User, error) {
}
// GetOwnedOrganizationsByUserIDDesc returns a list of organizations are owned by
// given user ID and descring order by given condition.
// given user ID, ordered descending by the given condition.
func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
sess := x.NewSession()
return getOwnedOrgsByUserID(sess.Desc(desc), userID)

6
routers/user/profile.go
View file

@ -74,10 +74,10 @@ func Profile(ctx *middleware.Context) {
ctx.Data["Title"] = u.DisplayName()
ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = u
orgs, err := models.GetOwnedOrgsByUserIDDesc(u.Id, "updated")
orgs, err := models.GetPublicOrgsByUserIDDesc(u.Id, "updated")
if err != nil {
ctx.Handle(500, "GetOwnedOrgsByUserIDDesc", err)
ctx.Handle(500, "GetPublicOrgsByUserIDDesc", err)
return
}
ctx.Data["Orgs"] = orgs