fix search implementation

Author: daviian

models/org.go

@@ -350,8 +350,11 @@ func GetOrgsByUserID(userID int64, showAll bool) ([]*User, error) {
 	return getOrgsByUserID(sess, userID, showAll)
 }
 
-func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
+func getOwnedOrgsByUserID(sess *xorm.Session, userID int64, showAll bool) ([]*User, error) {
 	orgs := make([]*User, 0, 10)
+	if !showAll {
+		sess.And("`org_user`.is_public=?", true)
+	}
 	return orgs, sess.
 		Where("`org_user`.uid=?", userID).
 		And("`org_user`.is_owner=?", true).
@@ -361,16 +364,16 @@ func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
 }
 
 // GetOwnedOrgsByUserID returns a list of organizations are owned by given user ID.
-func GetOwnedOrgsByUserID(userID int64) ([]*User, error) {
+func GetOwnedOrgsByUserID(userID int64, showAll bool) ([]*User, error) {
 	sess := x.NewSession()
 	defer sess.Close()
-	return getOwnedOrgsByUserID(sess, userID)
+	return getOwnedOrgsByUserID(sess, userID, showAll)
 }
 
 // GetOwnedOrgsByUserIDDesc returns a list of organizations are owned by
 // given user ID, ordered descending by the given condition.
-func GetOwnedOrgsByUserIDDesc(userID int64, desc string) ([]*User, error) {
-	return getOwnedOrgsByUserID(x.Desc(desc), userID)
+func GetOwnedOrgsByUserIDDesc(userID int64, desc string, showAll bool) ([]*User, error) {
+	return getOwnedOrgsByUserID(x.Desc(desc), userID, showAll)
 }
 
 // GetOrgUsersByUserID returns all organization-user relations by user ID.

models/repo_list.go

@@ -155,26 +155,44 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 	// Append conditions
 	if !opts.Starred && opts.OwnerID > 0 {
 		var searcherReposCond builder.Cond = builder.Eq{"owner_id": opts.OwnerID}
+		var ownerIds []int64
+		// Searcher == Owner
 		if opts.Searcher != nil {
-			var ownerIds []int64
-
 			ownerIds = append(ownerIds, opts.Searcher.ID)
-			err = opts.Searcher.GetOrganizations(true)
+			err = opts.Searcher.GetOwnedOrganizations(true)
 
 			if err != nil {
 				return nil, 0, fmt.Errorf("Organization: %v", err)
 			}
 
-			for _, org := range opts.Searcher.Orgs {
+			for _, org := range opts.Searcher.OwnedOrgs {
 				ownerIds = append(ownerIds, org.ID)
 			}
 
-			searcherReposCond = searcherReposCond.Or(builder.In("owner_id", ownerIds))
 			if opts.Collaborate {
-				searcherReposCond = searcherReposCond.Or(builder.Expr("id IN (SELECT repo_id FROM `access` WHERE access.user_id = ? AND owner_id != ?)",
+				searcherReposCond = searcherReposCond.Or(builder.Expr("id IN (SELECT repo_id FROM `access` WHERE access.user_id = ?) AND owner_id != ?",
 					opts.Searcher.ID, opts.Searcher.ID))
 			}
+		} else if opts.OwnerID > 0 {
+			ownerIds = append(ownerIds, opts.OwnerID)
+
+			owner, err := GetUserByID(opts.OwnerID)
+			if err != nil {
+				return nil, 0, fmt.Errorf("User: %v", err)
+			}
+
+			err = owner.GetOwnedOrganizations(false)
+
+			for _, org := range owner.OwnedOrgs {
+				ownerIds = append(ownerIds, org.ID)
+			}
+
+			if err != nil {
+				return nil, 0, fmt.Errorf("Organization: %v", err)
+			}
+
 		}
+		searcherReposCond = searcherReposCond.Or(builder.In("owner_id", ownerIds))
 		cond = cond.And(searcherReposCond)
 	}
 
@@ -268,17 +286,21 @@ func GetRecentUpdatedRepositories(opts *SearchRepoOptions) (repos RepositoryList
 		var ownerIds []int64
 
 		ownerIds = append(ownerIds, opts.Searcher.ID)
-		err := opts.Searcher.GetOrganizations(true)
+		err := opts.Searcher.GetOwnedOrganizations(true)
 
 		if err != nil {
 			return nil, 0, fmt.Errorf("Organization: %v", err)
 		}
 
-		for _, org := range opts.Searcher.Orgs {
+		for _, org := range opts.Searcher.OwnedOrgs {
 			ownerIds = append(ownerIds, org.ID)
 		}
 
 		cond = cond.Or(builder.In("owner_id", ownerIds))
+		if opts.Collaborate {
+			cond = cond.Or(builder.Expr("id IN (SELECT repo_id FROM `access` WHERE access.user_id = ?) AND owner_id != ?",
+				opts.Searcher.ID, opts.Searcher.ID))
+		}
 	}
 
 	count, err := x.Where(cond).Count(new(Repository))

models/user.go

@@ -554,8 +554,8 @@ func (u *User) GetMirrorRepositories() ([]*Repository, error) {
 }
 
 // GetOwnedOrganizations returns all organizations that user owns.
-func (u *User) GetOwnedOrganizations() (err error) {
-	u.OwnedOrgs, err = GetOwnedOrgsByUserID(u.ID)
+func (u *User) GetOwnedOrganizations(showAll bool) (err error) {
+	u.OwnedOrgs, err = GetOwnedOrgsByUserID(u.ID, showAll)
 	return err
 }
 

routers/repo/repo.go

@@ -35,7 +35,7 @@ func MustBeNotBare(ctx *context.Context) {
 }
 
 func checkContextUser(ctx *context.Context, uid int64) *models.User {
-	orgs, err := models.GetOwnedOrgsByUserIDDesc(ctx.User.ID, "updated_unix")
+	orgs, err := models.GetOwnedOrgsByUserIDDesc(ctx.User.ID, "updated_unix", true)
 	if err != nil {
 		ctx.Handle(500, "GetOwnedOrgsByUserIDDesc", err)
 		return nil