Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Operator does not exist bug on explore page with ONLY_SHOW_RELEVANT_REPOS #22454

Merged
merged 5 commits into from
Jan 16, 2023
Merged

Fix Operator does not exist bug on explore page with ONLY_SHOW_RELEVANT_REPOS #22454

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e895be8
Fix Operator does not exist bug on explore page with ONLY_SHOW_RELEVA…
zeripath Jan 15, 2023
1832d73
Apply suggestions from code review
zeripath Jan 15, 2023
10290cc
Merge branch 'main' into fix-json-operator-on-psql
jolheiser Jan 15, 2023
6427d15
Merge branch 'main' into fix-json-operator-on-psql
lunny Jan 16, 2023
0138808
Merge branch 'main' into fix-json-operator-on-psql
lunny Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions models/repo/repo_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/util"

Expand Down Expand Up @@ -496,8 +497,12 @@ func SearchRepositoryCondition(opts *SearchRepoOptions) builder.Cond {
// Only show a repo that either has a topic or description.
subQueryCond := builder.NewCond()

// Topic checking. Topics is non-null.
subQueryCond = subQueryCond.Or(builder.And(builder.Neq{"topics": "null"}, builder.Neq{"topics": "[]"}))
// Topic checking. Topics are present.
if setting.Database.UsePostgreSQL { // postgres stores the topics as json and not as text
subQueryCond = subQueryCond.Or(builder.And(builder.NotNull{"topics"}, builder.Neq{"(topics)::text": "[]"}))
} else {
subQueryCond = subQueryCond.Or(builder.And(builder.Neq{"topics": "null"}, builder.Neq{"topics": "[]"}))
}

// Description checking. Description not empty.
subQueryCond = subQueryCond.Or(builder.Neq{"description": ""})
Expand Down