NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 18:24:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

Fix unable to display individual-level project (#26198) (#26636)

Browse source 
Backport #26198 by @CaiCandong

As title

Before:

![image](https://github.com/go-gitea/gitea/assets/50507092/94afc3bf-5597-4151-a59b-5632840ffa21)

After:

![image](https://github.com/go-gitea/gitea/assets/50507092/df81aa0b-98a6-477d-a270-2e45b3dca0fc)

fix #26189

Co-authored-by: caicandong <50507092+CaiCandong@users.noreply.github.com>
This commit is contained in:
Giteabot 2023-08-22 01:38:06 +08:00 committed by GitHub
parent a4b14638b5
commit 352a495c02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routers/web/repo/issue.go
View file

@ -514,6 +514,12 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R
} }
func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) { func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) {
// Distinguish whether the owner of the repository
// is an individual or an organization
repoOwnerType := project_model.TypeIndividual
if repo.Owner.IsOrganization() {
repoOwnerType = project_model.TypeOrganization
}
var err error var err error
projects, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ projects, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{
RepoID: repo.ID, RepoID: repo.ID,
@ -529,7 +535,7 @@ func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) {
OwnerID: repo.OwnerID, OwnerID: repo.OwnerID,
Page: -1, Page: -1,
IsClosed: util.OptionalBoolFalse, IsClosed: util.OptionalBoolFalse,
Type: project_model.TypeOrganization, Type: repoOwnerType,
}) })
if err != nil { if err != nil {
ctx.ServerError("GetProjects", err) ctx.ServerError("GetProjects", err)
@ -552,7 +558,7 @@ func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) {
OwnerID: repo.OwnerID, OwnerID: repo.OwnerID,
Page: -1, Page: -1,
IsClosed: util.OptionalBoolTrue, IsClosed: util.OptionalBoolTrue,
Type: project_model.TypeOrganization, Type: repoOwnerType,
}) })
if err != nil { if err != nil {
ctx.ServerError("GetProjects", err) ctx.ServerError("GetProjects", err)