diff options
Diffstat (limited to 'routers/home.go')
| -rw-r--r-- | routers/home.go | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/routers/home.go b/routers/home.go index 0f59c95705..96e13cc68f 100644 --- a/routers/home.go +++ b/routers/home.go @@ -72,10 +72,11 @@ func Home(ctx *context.Context) { // RepoSearchOptions when calling search repositories type RepoSearchOptions struct { - OwnerID int64 - Private bool - PageSize int - TplName base.TplName + OwnerID int64 + Private bool + Restricted bool + PageSize int + TplName base.TplName } var ( @@ -136,6 +137,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) { ctx.Data["TopicOnly"] = topicOnly repos, count, err = models.SearchRepository(&models.SearchRepoOptions{ + Actor: ctx.User, Page: page, PageSize: opts.PageSize, OrderBy: orderBy, @@ -190,6 +192,7 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN if opts.Page <= 1 { opts.Page = 1 } + opts.Actor = ctx.User var ( users []*models.User @@ -261,22 +264,16 @@ func ExploreOrganizations(ctx *context.Context) { ctx.Data["PageIsExploreOrganizations"] = true ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled - var ownerID int64 - if ctx.User != nil && !ctx.User.IsAdmin { - ownerID = ctx.User.ID + visibleTypes := []structs.VisibleType{structs.VisibleTypePublic} + if ctx.User != nil { + visibleTypes = append(visibleTypes, structs.VisibleTypeLimited, structs.VisibleTypePrivate) } - opts := models.SearchUserOptions{ + RenderUserSearch(ctx, &models.SearchUserOptions{ Type: models.UserTypeOrganization, PageSize: setting.UI.ExplorePagingNum, - OwnerID: ownerID, - } - if ctx.User != nil { - opts.Visible = []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate} - } else { - opts.Visible = []structs.VisibleType{structs.VisibleTypePublic} - } - RenderUserSearch(ctx, &opts, tplExploreOrganizations) + Visible: visibleTypes, + }, tplExploreOrganizations) } // ExploreCode render explore code page @@ -310,7 +307,7 @@ func ExploreCode(ctx *context.Context) { // guest user or non-admin user if ctx.User == nil || !isAdmin { - repoIDs, err = models.FindUserAccessibleRepoIDs(userID) + repoIDs, err = models.FindUserAccessibleRepoIDs(ctx.User) if err != nil { ctx.ServerError("SearchResults", err) return |