Fix missing collabrative repos (#2367)

* fix missing collabrative repos

* fix bug of collabrative

* fix SQL quotes

models/repo_list.go

@@ -120,10 +120,12 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 		opts.Page = 1
 	}
 
+	var starJoin bool
 	if opts.Starred && opts.OwnerID > 0 {
 		cond = builder.Eq{
 			"star.uid": opts.OwnerID,
 		}
+		starJoin = true
 	}
 
 	opts.Keyword = strings.ToLower(opts.Keyword)
@@ -133,12 +135,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 
 	// Append conditions
 	if !opts.Starred && opts.OwnerID > 0 {
-		cond = cond.And(builder.Eq{"owner_id": opts.OwnerID})
+		var searcherReposCond builder.Cond = builder.Eq{"owner_id": opts.OwnerID}
-	}
-	if !opts.Private {
-		cond = cond.And(builder.Eq{"is_private": false})
-	}
-
 		if opts.Searcher != nil {
 			var ownerIds []int64
 
@@ -153,14 +150,19 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 				ownerIds = append(ownerIds, org.ID)
 			}
 
-		searcherReposCond := builder.In("owner_id", ownerIds)
+			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))
 			}
+		}
 		cond = cond.And(searcherReposCond)
 	}
 
+	if !opts.Private {
+		cond = cond.And(builder.Eq{"is_private": false})
+	}
+
 	if len(opts.OrderBy) == 0 {
 		opts.OrderBy = "name ASC"
 	}
@@ -168,7 +170,7 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 	sess := x.NewSession()
 	defer sess.Close()
 
-	if opts.Starred && opts.OwnerID > 0 {
+	if starJoin {
 		count, err = sess.
 			Join("INNER", "star", "star.repo_id = repository.id").
 			Where(cond).

routers/home.go

@@ -117,6 +117,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 			Searcher:    ctx.User,
 			OrderBy:     orderBy,
 			Private:     opts.Private,
+			Collaborate: true,
 		})
 		if err != nil {
 			ctx.Handle(500, "opts.Ranger", err)
@@ -131,6 +132,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 				Page:        page,
 				PageSize:    opts.PageSize,
 				Searcher:    ctx.User,
+				Collaborate: true,
 			})
 			if err != nil {
 				ctx.Handle(500, "SearchRepositoryByName", err)

routers/user/profile.go

@@ -212,6 +212,7 @@ func Profile(ctx *context.Context) {
 				Page:        page,
 				IsProfile:   true,
 				PageSize:    setting.UI.User.RepoPagingNum,
+				Collaborate: true,
 			})
 			if err != nil {
 				ctx.Handle(500, "SearchRepositoryByName", err)