Ensure limited and private org public repos are displayed on "private"

Signed-off-by: Andrew Thornton <[email protected]>

models/repo_list.go

@@ -222,7 +222,13 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
  }
 
  if opts.OnlyPrivate {
- cond = cond.And(builder.Eq{"is_private": true})
+ cond = cond.And(builder.Or(
+ builder.Eq{"is_private": true},
+ builder.In("owner_id", builder.Select("id").From("`user`").Where(
+ builder.And(
+ builder.Eq{"type": UserTypeOrganization},
+ builder.Or(builder.Eq{"visibility": structs.VisibleTypeLimited}, builder.Eq{"visibility": structs.VisibleTypePrivate}),
+ )))))
  }
 
  if opts.Template != util.OptionalBoolNone {

templates/user/dashboard/repolist.tmpl

@@ -101,7 +101,7 @@
  </div>
  <div class="ui attached table segment">
  <ul class="repo-owner-name-list">
- <li v-for="repo in repos" :class="{'private': repo.private}" v-show="showRepo(repo)">
+ <li v-for="repo in repos" :class="{'private': repo.private}">
  <a :href="suburl + '/' + repo.full_name">
  <svg :class="'svg ' + repoClass(repo)" width="16" height="16" aria-hidden="true"><use :xlink:href="'#' + repoClass(repo)" /></svg>
  <strong class="text truncate item-name">${repo.full_name}</strong>

web_src/js/index.js

@@ -2911,51 +2911,6 @@ function initVueComponents() {
  this.searchRepos();
  },
 
- showArchivedRepo(repo) {
- switch (this.archivedFilter) {
- case 'both':
- return true;
- case 'unarchived':
- return !repo.archived;
- case 'archived':
- return repo.archived;
- default:
- return !repo.archived;
- }
- },
-
- showPrivateRepo(repo) {
- switch (this.privateFilter) {
- case 'both':
- return true;
- case 'public':
- return !repo.private;
- case 'private':
- return repo.private;
- default:
- return true;
- }
- },
-
- showFilteredRepo(repo) {
- switch (this.reposFilter) {
- case 'sources':
- return repo.owner.id === this.uid && !repo.mirror && !repo.fork;
- case 'forks':
- return repo.owner.id === this.uid && !repo.mirror && repo.fork;
- case 'mirrors':
- return repo.mirror;
- case 'collaborative':
- return repo.owner.id !== this.uid && !repo.mirror;
- default:
- return true;
- }
- },
-
- showRepo(repo) {
- return this.showArchivedRepo(repo) && this.showPrivateRepo(repo) && this.showFilteredRepo(repo);
- },
-
  searchRepos() {
  const self = this;