hotfixes

+ fix for private repo being shown
+ css fix

Author: snematoda

models/repo/repo_list.go

@@ -746,7 +746,7 @@ func GetUserRepositories(opts *SearchRepoOptions) (RepositoryList, int64, error)
 	return repos, count, db.SetSessionPagination(sess, opts).Find(&repos)
 }
 
-func GetPrimaryRepoLanguageList(ctx context.Context, ownerID int64, private bool) (LanguageStatList, error) {
+func GetPrimaryRepoLanguageList(ctx context.Context, ownerID int64, user *user_model.User) (LanguageStatList, error) {
 	languageList := make(LanguageStatList, 0)
 
 	q := db.GetEngine(ctx).
@@ -755,15 +755,12 @@ func GetPrimaryRepoLanguageList(ctx context.Context, ownerID int64, private bool
 		Where(builder.Eq{"is_primary": true})
 
 	if ownerID > 0 {
-		ids, err := SearchRepositoryIDsByCondition(ctx, builder.NewCond().And(
-			builder.Eq{"owner_id": ownerID},
-			builder.Eq{"is_private": private},
-		))
+		ownerIDs, err := FindUserCodeAccessibleOwnerRepoIDs(ctx, ownerID, user)
 		if err != nil {
 			return nil, err
 		}
 
-		q = q.In("repo_id", ids)
+		q = q.In("repo_id", ownerIDs)
 	}
 
 	err := q.Distinct("language").

routers/api/v1/repo/languages.go

@@ -12,7 +12,7 @@ import (
 )
 
 func SendPrimaryLanguageList(ctx *context.APIContext, ownerID int64) {
-	langs, err := repo_model.GetPrimaryRepoLanguageList(ctx, ownerID, ctx.IsSigned)
+	langs, err := repo_model.GetPrimaryRepoLanguageList(ctx, ownerID, ctx.Doer)
 	if err != nil {
 		ctx.InternalServerError(err)
 	}

routers/web/explore/repo.go

@@ -137,7 +137,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		return
 	}
 
-	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, opts.OwnerID, opts.Private)
+	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, 0, ctx.Doer)
 	if err != nil {
 		ctx.ServerError("GetPrimaryRepoLanguageList", err)
 		return

routers/web/org/home.go

@@ -134,7 +134,7 @@ func Home(ctx *context.Context) {
 		isFollowing = user_model.IsFollowing(ctx.Doer.ID, ctx.ContextUser.ID)
 	}
 
-	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, org.ID, ctx.IsSigned)
+	programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, org.ID, ctx.Doer)
 	if err != nil {
 		ctx.ServerError("GetPrimaryRepoLanguageList", err)
 		return

routers/web/user/profile.go

@@ -266,7 +266,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileGi
 
 		total = int(count)
 
-		programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, ctx.ContextUser.ID, ctx.IsSigned)
+		programLanguages, err := repo_model.GetPrimaryRepoLanguageList(ctx, ctx.ContextUser.ID, ctx.Doer)
 		if err != nil {
 			ctx.ServerError("GetPrimaryRepoLanguageList", err)
 			return

web_src/css/base.css

@@ -581,7 +581,7 @@ a.label,
 }
 
 .ui.dropdown .menu.short {
-  max-width: 60vh;
+  max-height: 60vh;
   overflow-y: auto;
 }