From 9d0875091ac4f885a5d588ddf4f621ffcb8c46e7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 21 Feb 2023 16:53:06 +0900 Subject: [PATCH 1/6] show project name instead of title --- models/project/project.go | 19 +++++++++++++++++++ templates/repo/issue/list.tmpl | 8 ++++---- templates/repo/issue/new_form.tmpl | 6 +++--- .../repo/issue/view_content/comments.tmpl | 6 +++--- .../repo/issue/view_content/sidebar.tmpl | 6 +++--- templates/shared/issuelist.tmpl | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/models/project/project.go b/models/project/project.go index 931ef44675afd..a11c0a502c2d4 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -144,6 +144,25 @@ func (p *Project) Link() string { return "" } +// Name return the project's name which is combined with owner/repo/project's name +func (p *Project) Name() string { + if p.OwnerID > 0 { + if err := p.LoadOwner(db.DefaultContext); err != nil { + log.Error("LoadOwner: %v", err) + return "" + } + return fmt.Sprintf("%s/-/%s", p.Owner.Name, p.Title) + } + if p.RepoID > 0 { + if err := p.LoadRepo(db.DefaultContext); err != nil { + log.Error("LoadRepo: %v", err) + return "" + } + return fmt.Sprintf("%s/%s/%s", p.Repo.OwnerName, p.Repo.Name, p.Title) + } + return "" +} + func (p *Project) IsOrganizationProject() bool { return p.Type == TypeOrganization } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 2b1bea822fbf0..8921830922ca1 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -101,7 +101,7 @@ {{range .OpenProjects}} {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -113,7 +113,7 @@ {{range .ClosedProjects}} {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -273,7 +273,7 @@ {{range .OpenProjects}}
{{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}}
{{end}} {{end}} @@ -285,7 +285,7 @@ {{range .ClosedProjects}}
{{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}}
{{end}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 8346d07a13c66..1992900f15b25 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -178,7 +178,7 @@ {{range .OpenProjects}} {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -190,7 +190,7 @@ {{range .ClosedProjects}} {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -203,7 +203,7 @@ {{if .Project}} {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Project.Title}} + {{.Project.Name}} {{end}} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index b81c3c7f0351b..9ee9dc8e9150b 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -720,12 +720,12 @@ {{template "shared/user/authorlink" .Poster}} {{if gt .OldProjectID 0}} {{if gt .ProjectID 0}} - {{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Title|Escape) (.Project.Title|Escape) $createdStr | Safe}} + {{$.locale.Tr "repo.issues.change_project_at" (.OldProject.Name|Escape) (.Project.Name|Escape) $createdStr | Safe}} {{else}} - {{$.locale.Tr "repo.issues.remove_project_at" (.OldProject.Title|Escape) $createdStr | Safe}} + {{$.locale.Tr "repo.issues.remove_project_at" (.OldProject.Name|Escape) $createdStr | Safe}} {{end}} {{else if gt .ProjectID 0}} - {{$.locale.Tr "repo.issues.add_project_at" (.Project.Title|Escape) $createdStr | Safe}} + {{$.locale.Tr "repo.issues.add_project_at" (.Project.Name|Escape) $createdStr | Safe}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 2b24825b5f7bd..a899b417a51e1 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -240,7 +240,7 @@ {{range .OpenProjects}} {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -252,7 +252,7 @@ {{range .ClosedProjects}} {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Title}} + {{.Name}} {{end}} {{end}} @@ -264,7 +264,7 @@ {{if .Issue.ProjectID}} {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Issue.Project.Title}} + {{.Issue.Project.Name}} {{end}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index a43047c79de91..9dc6a615799a5 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -88,7 +88,7 @@ {{end}} {{if .Project}} - {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Title}} + {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Name}} {{end}} {{if .Ref}} From 4c238890ed88034d03b5c858a5ebc634a2c184a7 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 23 Feb 2023 03:12:28 +0900 Subject: [PATCH 2/6] test projecttmpldata --- models/project/project.go | 80 ++++++++++++++++--- routers/web/repo/issue.go | 20 ++--- templates/repo/issue/list.tmpl | 46 +++++------ templates/repo/issue/new_form.tmpl | 22 ++--- .../repo/issue/view_content/sidebar.tmpl | 22 ++--- 5 files changed, 124 insertions(+), 66 deletions(-) diff --git a/models/project/project.go b/models/project/project.go index a11c0a502c2d4..ac7483b3d4179 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -200,31 +200,35 @@ func IsTypeValid(p Type) bool { // SearchOptions are options for GetProjects type SearchOptions struct { - OwnerID int64 - RepoID int64 - Page int - IsClosed util.OptionalBool - SortType string - Type Type + ProjectID int64 + OwnerID int64 + RepoID int64 + Page int + IsClosed util.OptionalBool + SortType string + Type Type } func (opts *SearchOptions) toConds() builder.Cond { cond := builder.NewCond() + if opts.ProjectID > 0 { + cond = cond.And(builder.Eq{"project.id": opts.ProjectID}) + } if opts.RepoID > 0 { - cond = cond.And(builder.Eq{"repo_id": opts.RepoID}) + cond = cond.And(builder.Eq{"project.repo_id": opts.RepoID}) } switch opts.IsClosed { case util.OptionalBoolTrue: - cond = cond.And(builder.Eq{"is_closed": true}) + cond = cond.And(builder.Eq{"project.is_closed": true}) case util.OptionalBoolFalse: - cond = cond.And(builder.Eq{"is_closed": false}) + cond = cond.And(builder.Eq{"project.is_closed": false}) } if opts.Type > 0 { - cond = cond.And(builder.Eq{"type": opts.Type}) + cond = cond.And(builder.Eq{"project.type": opts.Type}) } if opts.OwnerID > 0 { - cond = cond.And(builder.Eq{"owner_id": opts.OwnerID}) + cond = cond.And(builder.Eq{"project.owner_id": opts.OwnerID}) } return cond } @@ -265,6 +269,60 @@ func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, e return projects, count, e.Find(&projects) } +type ProjcetTmplData struct { + Project Project `xorm:"extends"` + Repo repo_model.Repository `xorm:"extends"` + Owner user_model.User `xorm:"extends"` +} + +func (ptd *ProjcetTmplData) GetFullTitle() string { + if ptd.Project.OwnerID > 0 { + return fmt.Sprintf("%s/-/%s", ptd.Owner.Name, ptd.Project.Title) + } + if ptd.Project.RepoID > 0 { + return fmt.Sprintf("%s/%s/%s", ptd.Repo.OwnerName, ptd.Repo.Name, ptd.Project.Title) + } + return ptd.Project.Title +} + +// GetProjectsTmplData returns a list of all projects that have been created in the repository +func GetProjectsTmplData(ctx context.Context, opts SearchOptions) ([]*ProjcetTmplData, int64, error) { + e := db.GetEngine(db.DefaultContext).Table("project") + ptdl := make([]*ProjcetTmplData, 0, setting.UI.IssuePagingNum) + cond := opts.toConds() + + if opts.RepoID > 0 { + e = e.Select("project.*, repository.*").Join("INNER", "repository", "repository.id = project.repo_id") + } + if opts.OwnerID > 0 { + e = e.Select("project.*, user.*").Join("INNER", "user", "user.id = project.owner_id") + } + + e = e.Where(cond) + + if opts.Page > 0 { + e = e.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum) + } + + switch opts.SortType { + case "oldest": + e.Desc("created_unix") + case "recentupdate": + e.Desc("updated_unix") + case "leastupdate": + e.Asc("updated_unix") + default: + e.Asc("created_unix") + } + + count, err := e.FindAndCount(&ptdl) + if err != nil { + return nil, 0, fmt.Errorf("FindAndCount: %w", err) + } + + return ptdl, count, nil +} + // NewProject creates a new Project func NewProject(p *Project) error { if !IsBoardTypeValid(p.BoardType) { diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 05ba26a70cda6..946ea3613d39e 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -485,51 +485,51 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) { var err error - projects, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ + ptdl, _, err := project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ RepoID: repo.ID, Page: -1, IsClosed: util.OptionalBoolFalse, Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerError("GetProjectsTmplData", err) return } - projects2, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ + ptdl2, _, err := project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ OwnerID: repo.OwnerID, Page: -1, IsClosed: util.OptionalBoolFalse, Type: project_model.TypeOrganization, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerError("GetProjectsTmplData", err) return } - ctx.Data["OpenProjects"] = append(projects, projects2...) + ctx.Data["OpenProjectsTmplData"] = append(ptdl, ptdl2...) - projects, _, err = project_model.FindProjects(ctx, project_model.SearchOptions{ + ptdl, _, err = project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ RepoID: repo.ID, Page: -1, IsClosed: util.OptionalBoolTrue, Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerError("GetProjectsTmplData", err) return } - projects2, _, err = project_model.FindProjects(ctx, project_model.SearchOptions{ + ptdl2, _, err = project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ OwnerID: repo.OwnerID, Page: -1, IsClosed: util.OptionalBoolTrue, Type: project_model.TypeOrganization, }) if err != nil { - ctx.ServerError("GetProjects", err) + ctx.ServerError("GetProjectsTmplData", err) return } - ctx.Data["ClosedProjects"] = append(projects, projects2...) + ctx.Data["ClosedProjectsTmplData"] = append(ptdl, ptdl2...) } // repoReviewerSelection items to bee shown diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8921830922ca1..10e0eb0e38aa2 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,7 +81,7 @@ -
+
{{.locale.Tr "repo.issues.filter_project"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -93,27 +93,27 @@
{{.locale.Tr "repo.issues.filter_project_all"}} {{.locale.Tr "repo.issues.filter_project_none"}} - {{if .OpenProjects}} + {{if .OpenProjectsTmplData}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjects}} - - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .OpenProjectsTmplData}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}} {{end}} {{end}} - {{if .ClosedProjects}} + {{if .ClosedProjectsTmplData}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjects}} - - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .ClosedProjectsTmplData}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}} {{end}} {{end}} @@ -249,14 +249,14 @@
{{range .Milestones}}
- {{.Name}} + {{.GetFullTitle}}
{{end}} -
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -265,27 +265,27 @@
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjects}} + {{if .OpenProjectsTmplData}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjects}} -
- {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .OpenProjectsTmplData}} +
+ {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}}
{{end}} {{end}} - {{if .ClosedProjects}} + {{if .ClosedProjectsTmplData}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjects}} -
- {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .ClosedProjectsTmplData}} +
+ {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}}
{{end}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 1992900f15b25..069097849299d 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -158,39 +158,39 @@
{{.locale.Tr "repo.issues.new.add_project_title"}}
- {{if or .OpenProjects .ClosedProjects}} + {{if or .OpenProjectsTmplData .ClosedProjectsTmplData}}
{{svg "octicon-search" 16}}
{{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if and (not .OpenProjects) (not .ClosedProjects)}} + {{if and (not .OpenProjectsTmplData) (not .ClosedProjectsTmplData)}}
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} - {{if .OpenProjects}} + {{if .OpenProjectsTmplData}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjects}} - + {{range .OpenProjectsTmplData}} + {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Name}} + {{.GetFullTitle}} {{end}} {{end}} - {{if .ClosedProjects}} + {{if .ClosedProjectsTmplData}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjects}} - + {{range .ClosedProjectsTmplData}} + {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Name}} + {{.GetFullTitle}} {{end}} {{end}} @@ -203,7 +203,7 @@ {{if .Project}} {{svg "octicon-project" 18 "gt-mr-3"}} - {{.Project.Name}} + {{.Project.Title}} {{end}}
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index a899b417a51e1..0f3d6127e29a8 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -225,34 +225,34 @@
{{.locale.Tr "repo.issues.new.add_project_title"}}
- {{if or .OpenProjects .ClosedProjects}} + {{if or .OpenProjectsTmplData .ClosedProjectsTmplData}}
{{svg "octicon-search" 16}}
{{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjects}} + {{if .OpenProjectsTmplData}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjects}} - - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .OpenProjectsTmplData}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}} {{end}} {{end}} - {{if .ClosedProjects}} + {{if .ClosedProjectsTmplData}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjects}} - - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Name}} + {{range .ClosedProjectsTmplData}} + + {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{.GetFullTitle}} {{end}} {{end}} From d1f48c292b5854195723e7511d18dec2027b0f1f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 23 Feb 2023 03:15:46 +0900 Subject: [PATCH 3/6] remove unused code --- models/project/project.go | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/models/project/project.go b/models/project/project.go index ac7483b3d4179..612ae0068d9bf 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -200,20 +200,16 @@ func IsTypeValid(p Type) bool { // SearchOptions are options for GetProjects type SearchOptions struct { - ProjectID int64 - OwnerID int64 - RepoID int64 - Page int - IsClosed util.OptionalBool - SortType string - Type Type + OwnerID int64 + RepoID int64 + Page int + IsClosed util.OptionalBool + SortType string + Type Type } func (opts *SearchOptions) toConds() builder.Cond { cond := builder.NewCond() - if opts.ProjectID > 0 { - cond = cond.And(builder.Eq{"project.id": opts.ProjectID}) - } if opts.RepoID > 0 { cond = cond.And(builder.Eq{"project.repo_id": opts.RepoID}) } From e771eb9d9f6a215be97c9979862168649680941f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 23 Feb 2023 13:06:40 +0900 Subject: [PATCH 4/6] use ProjectTmplData to render fulltitle --- models/issues/issue_list.go | 9 ++ models/project/project.go | 91 ++++++++++--------- models/user/list.go | 6 ++ routers/web/repo/issue.go | 62 +++++++++---- routers/web/user/home.go | 8 ++ templates/repo/issue/list.tmpl | 46 +++++----- templates/repo/issue/new_form.tmpl | 20 ++-- .../repo/issue/view_content/sidebar.tmpl | 22 ++--- templates/shared/issuelist.tmpl | 4 +- 9 files changed, 161 insertions(+), 107 deletions(-) diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go index 6ddadd27ed442..f5a73770b3d00 100644 --- a/models/issues/issue_list.go +++ b/models/issues/issue_list.go @@ -229,6 +229,15 @@ func (issues IssueList) loadMilestones(ctx context.Context) error { return nil } +func (issues IssueList) GetProjects() (pl project_model.ProjectList) { + for _, issue := range issues { + if issue.Project != nil { + pl = append(pl, issue.Project) + } + } + return pl +} + func (issues IssueList) getProjectIDs() []int64 { ids := make(container.Set[int64], len(issues)) for _, issue := range issues { diff --git a/models/project/project.go b/models/project/project.go index 612ae0068d9bf..1539f63329098 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" + "code.gitea.io/gitea/modules/container" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" @@ -33,6 +34,9 @@ type ( // Type is used to identify the type of project in question and ownership Type uint8 + + // ProjectList defines a list of projects + ProjectList []*Project ) const ( @@ -235,9 +239,9 @@ func CountProjects(ctx context.Context, opts SearchOptions) (int64, error) { } // FindProjects returns a list of all projects that have been created in the repository -func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, error) { +func FindProjects(ctx context.Context, opts SearchOptions) (ProjectList, int64, error) { e := db.GetEngine(ctx) - projects := make([]*Project, 0, setting.UI.IssuePagingNum) + projects := make(ProjectList, 0, setting.UI.IssuePagingNum) cond := opts.toConds() count, err := e.Where(cond).Count(new(Project)) @@ -265,58 +269,63 @@ func FindProjects(ctx context.Context, opts SearchOptions) ([]*Project, int64, e return projects, count, e.Find(&projects) } -type ProjcetTmplData struct { - Project Project `xorm:"extends"` - Repo repo_model.Repository `xorm:"extends"` - Owner user_model.User `xorm:"extends"` +type ProjectsTmplData struct { + ProjectRepos map[int64]*repo_model.Repository + ProjectOwners map[int64]*user_model.User } -func (ptd *ProjcetTmplData) GetFullTitle() string { - if ptd.Project.OwnerID > 0 { - return fmt.Sprintf("%s/-/%s", ptd.Owner.Name, ptd.Project.Title) - } - if ptd.Project.RepoID > 0 { - return fmt.Sprintf("%s/%s/%s", ptd.Repo.OwnerName, ptd.Repo.Name, ptd.Project.Title) +func (pl ProjectList) getRepoIDs() []int64 { + ids := make(container.Set[int64], len(pl)) + for _, p := range pl { + if p.RepoID > 0 { + ids.Add(p.RepoID) + } } - return ptd.Project.Title + return ids.Values() } -// GetProjectsTmplData returns a list of all projects that have been created in the repository -func GetProjectsTmplData(ctx context.Context, opts SearchOptions) ([]*ProjcetTmplData, int64, error) { - e := db.GetEngine(db.DefaultContext).Table("project") - ptdl := make([]*ProjcetTmplData, 0, setting.UI.IssuePagingNum) - cond := opts.toConds() - - if opts.RepoID > 0 { - e = e.Select("project.*, repository.*").Join("INNER", "repository", "repository.id = project.repo_id") - } - if opts.OwnerID > 0 { - e = e.Select("project.*, user.*").Join("INNER", "user", "user.id = project.owner_id") +func (pl ProjectList) getOwnerIDs() []int64 { + ids := make(container.Set[int64], len(pl)) + for _, p := range pl { + if p.OwnerID > 0 { + ids.Add(p.OwnerID) + } } + return ids.Values() +} - e = e.Where(cond) +func GetProjectTmplData(ps ProjectList) (*ProjectsTmplData, error) { + var err error + ptd := new(ProjectsTmplData) - if opts.Page > 0 { - e = e.Limit(setting.UI.IssuePagingNum, (opts.Page-1)*setting.UI.IssuePagingNum) - } - - switch opts.SortType { - case "oldest": - e.Desc("created_unix") - case "recentupdate": - e.Desc("updated_unix") - case "leastupdate": - e.Asc("updated_unix") - default: - e.Asc("created_unix") + ptd.ProjectRepos, err = repo_model.GetRepositoriesMapByIDs(ps.getRepoIDs()) + if err != nil { + return nil, err } - count, err := e.FindAndCount(&ptdl) + ptd.ProjectOwners, err = user_model.GetUsersMapByIDs(ps.getOwnerIDs()) if err != nil { - return nil, 0, fmt.Errorf("FindAndCount: %w", err) + return nil, err } + fmt.Println(ptd) + return ptd, nil +} - return ptdl, count, nil +func (ptd *ProjectsTmplData) RenderFullTitle(p *Project) string { + if p.RepoID > 0 { + repo, ok := ptd.ProjectRepos[p.RepoID] + if ok { + return fmt.Sprintf("%s/%s/%s", repo.OwnerName, repo.Name, p.Title) + } + } + if p.OwnerID > 0 { + fmt.Println(ptd.ProjectOwners) + owner, ok := ptd.ProjectOwners[p.OwnerID] + if ok { + return fmt.Sprintf("%s/-/%s", owner.Name, p.Title) + } + } + return "" } // NewProject creates a new Project diff --git a/models/user/list.go b/models/user/list.go index 6b3b7bea9ad38..386ea78c8b6e0 100644 --- a/models/user/list.go +++ b/models/user/list.go @@ -81,3 +81,9 @@ func GetUsersByIDs(ids []int64) (UserList, error) { Find(&ous) return ous, err } + +// GetUsersMapByIDs returns all resolved users from a list of Ids. +func GetUsersMapByIDs(ids []int64) (map[int64]*User, error) { + usm := make(map[int64]*User, len(ids)) + return usm, db.GetEngine(db.DefaultContext).In("id", ids).Find(&usm) +} diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index 946ea3613d39e..4fc75086b4628 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -379,11 +379,19 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti return 0 } - retrieveProjects(ctx, repo) + ps := retrieveProjects(ctx, repo) if ctx.Written() { return } + // Get ProjectTmplData + ps = append(ps, issueList.GetProjects()...) + ctx.Data["ProjectTmplData"], err = project_model.GetProjectTmplData(ps) + if err != nil { + ctx.ServerError("GetProjectTmplData", err) + return + } + ctx.Data["IssueStats"] = issueStats ctx.Data["SelLabelIDs"] = labelIDs ctx.Data["SelectLabels"] = selectLabels @@ -483,53 +491,55 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R handleTeamMentions(ctx) } -func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) { +func retrieveProjects(ctx *context.Context, repo *repo_model.Repository) project_model.ProjectList { var err error - ptdl, _, err := project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ + ops, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ RepoID: repo.ID, Page: -1, IsClosed: util.OptionalBoolFalse, Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjectsTmplData", err) - return + ctx.ServerError("FindProjects", err) + return nil } - ptdl2, _, err := project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ + ops2, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ OwnerID: repo.OwnerID, Page: -1, IsClosed: util.OptionalBoolFalse, Type: project_model.TypeOrganization, }) if err != nil { - ctx.ServerError("GetProjectsTmplData", err) - return + ctx.ServerError("FindProjects", err) + return nil } + ops = append(ops, ops2...) + ctx.Data["OpenProjects"] = ops - ctx.Data["OpenProjectsTmplData"] = append(ptdl, ptdl2...) - - ptdl, _, err = project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ + cps, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ RepoID: repo.ID, Page: -1, IsClosed: util.OptionalBoolTrue, Type: project_model.TypeRepository, }) if err != nil { - ctx.ServerError("GetProjectsTmplData", err) - return + ctx.ServerError("FindProjects", err) + return nil } - ptdl2, _, err = project_model.GetProjectsTmplData(ctx, project_model.SearchOptions{ + cps2, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ OwnerID: repo.OwnerID, Page: -1, IsClosed: util.OptionalBoolTrue, Type: project_model.TypeOrganization, }) if err != nil { - ctx.ServerError("GetProjectsTmplData", err) - return + ctx.ServerError("FindProjects", err) + return nil } + cps = append(cps, cps2...) + ctx.Data["ClosedProjects"] = cps - ctx.Data["ClosedProjectsTmplData"] = append(ptdl, ptdl2...) + return append(ops, cps...) } // repoReviewerSelection items to bee shown @@ -750,10 +760,15 @@ func RetrieveRepoMetas(ctx *context.Context, repo *repo_model.Repository, isPull return nil } - retrieveProjects(ctx, repo) + ps := retrieveProjects(ctx, repo) if ctx.Written() { return nil } + ctx.Data["ProjectTmplData"], err = project_model.GetProjectTmplData(ps) + if err != nil { + ctx.ServerError("GetProjectTmplData", err) + return nil + } brs, _, err := ctx.Repo.GitRepo.GetBranchNames(0, 0) if err != nil { @@ -1376,13 +1391,20 @@ func ViewIssue(ctx *context.Context) { ctx.Data["HasSelectedLabel"] = hasSelected // Check milestone and assignee. + var ps project_model.ProjectList if ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) { RetrieveRepoMilestonesAndAssignees(ctx, repo) - retrieveProjects(ctx, repo) - + ps = retrieveProjects(ctx, repo) if ctx.Written() { return } + + } + + ctx.Data["ProjectTmplData"], err = project_model.GetProjectTmplData(append(ps, issue.Project)) + if err != nil { + ctx.ServerError("GetProjectTmplData", err) + return } if issue.IsPull { diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 4f45c1d5c3149..41c105a891cf9 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -18,6 +18,7 @@ import ( "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" "code.gitea.io/gitea/models/organization" + project_model "code.gitea.io/gitea/models/project" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" @@ -609,6 +610,13 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) { ctx.Data["Issues"] = issues + projects := issues_model.IssueList(issues).GetProjects() + ctx.Data["ProjectTmplData"], err = project_model.GetProjectTmplData(projects) + if err != nil { + ctx.ServerError("GetProjectTmplData", err) + return + } + approvalCounts, err := issues_model.IssueList(issues).GetApprovalCounts(ctx) if err != nil { ctx.ServerError("ApprovalCounts", err) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 10e0eb0e38aa2..1d28c373c14e5 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -81,7 +81,7 @@
-
+
{{.locale.Tr "repo.issues.filter_project"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -93,27 +93,27 @@
{{.locale.Tr "repo.issues.filter_project_all"}} {{.locale.Tr "repo.issues.filter_project_none"}} - {{if .OpenProjectsTmplData}} + {{if .OpenProjects}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjectsTmplData}} - - {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{range .OpenProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} - {{if .ClosedProjectsTmplData}} + {{if .ClosedProjects}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjectsTmplData}} - - {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{range .ClosedProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} @@ -249,14 +249,14 @@
{{range .Milestones}}
- {{.GetFullTitle}} + {{$.ProjectTmplData.RenderFullTitle .}}
{{end}}
-
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} @@ -265,27 +265,27 @@
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjectsTmplData}} + {{if .OpenProjects}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjectsTmplData}} -
- {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{range .OpenProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .}}
{{end}} {{end}} - {{if .ClosedProjectsTmplData}} + {{if .ClosedProjects}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjectsTmplData}} -
- {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{range .ClosedProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .}}
{{end}} {{end}} diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index 069097849299d..74135a78425d1 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -158,39 +158,39 @@
{{.locale.Tr "repo.issues.new.add_project_title"}}
- {{if or .OpenProjectsTmplData .ClosedProjectsTmplData}} + {{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}}
{{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if and (not .OpenProjectsTmplData) (not .ClosedProjectsTmplData)}} + {{if and (not .OpenProjects) (not .ClosedProjects)}}
{{.locale.Tr "repo.issues.new.no_items"}}
{{else}} - {{if .OpenProjectsTmplData}} + {{if .OpenProjects}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjectsTmplData}} - + {{range .OpenProjects}} + {{svg "octicon-project" 18 "gt-mr-3"}} - {{.GetFullTitle}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} - {{if .ClosedProjectsTmplData}} + {{if .ClosedProjects}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjectsTmplData}} - + {{range .ClosedProjects}} + {{svg "octicon-project" 18 "gt-mr-3"}} - {{.GetFullTitle}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index 0f3d6127e29a8..2189d10ca9d7c 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -225,34 +225,34 @@
{{.locale.Tr "repo.issues.new.add_project_title"}}
- {{if or .OpenProjectsTmplData .ClosedProjectsTmplData}} + {{if or .OpenProjects .ClosedProjects}}
{{svg "octicon-search" 16}}
{{end}}
{{.locale.Tr "repo.issues.new.clear_projects"}}
- {{if .OpenProjectsTmplData}} + {{if .OpenProjects}}
{{.locale.Tr "repo.issues.new.open_projects"}}
- {{range .OpenProjectsTmplData}} - - {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{range .OpenProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} - {{if .ClosedProjectsTmplData}} + {{if .ClosedProjects}}
{{.locale.Tr "repo.issues.new.closed_projects"}}
- {{range .ClosedProjectsTmplData}} + {{range .ClosedProjects}} {{if .Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.GetFullTitle}} + {{$.ProjectTmplData.RenderFullTitle .}} {{end}} {{end}} @@ -263,8 +263,8 @@
{{if .Issue.ProjectID}} - {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} - {{.Issue.Project.Name}} + {{if .Issue.Project.IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "gt-mr-3"}}{{else}}{{svg "octicon-project" 18 "gt-mr-3"}}{{end}} + {{$.ProjectTmplData.RenderFullTitle .Issue.Project}} {{end}}
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 9dc6a615799a5..a59ba65f0c55b 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -87,8 +87,8 @@ {{end}} {{if .Project}} - - {{svg "octicon-project" 14 "gt-mr-2"}}{{.Project.Name}} + + {{svg "octicon-project" 14 "gt-mr-2"}}{{$.ProjectTmplData.RenderFullTitle .Project}} {{end}} {{if .Ref}} From aec0cbd514627cd88caa59f3c001703172d5cc96 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 23 Feb 2023 16:01:15 +0900 Subject: [PATCH 5/6] add nolint --- models/project/project.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/project/project.go b/models/project/project.go index 1539f63329098..e28e858f488d4 100644 --- a/models/project/project.go +++ b/models/project/project.go @@ -36,7 +36,7 @@ type ( Type uint8 // ProjectList defines a list of projects - ProjectList []*Project + ProjectList []*Project //nolint ) const ( From 8feb7352fbe01a56d2e04e5ccfdc0ee05e95bfb0 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 24 Feb 2023 00:34:25 +0900 Subject: [PATCH 6/6] fix --- templates/repo/issue/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 1d28c373c14e5..570e60fa762fb 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -249,7 +249,7 @@
{{range .Milestones}}
- {{$.ProjectTmplData.RenderFullTitle .}} + {{.Name}}
{{end}}