From 474b7ec155c47acfd3a49bef5317b278ebfc764c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 28 Jan 2023 17:11:52 +0800 Subject: [PATCH 1/8] Fix issues list page project assign to org/user level projects and fix bug which only list open/closed projects --- routers/web/repo/issue.go | 14 +++----------- templates/repo/issue/list.tmpl | 30 +++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go index edd9821ac783f..b6d575927e93d 100644 --- a/routers/web/repo/issue.go +++ b/routers/web/repo/issue.go @@ -362,17 +362,9 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti return 0 } - if ctx.Repo.CanWriteIssuesOrPulls(ctx.Params(":type") == "pulls") { - projects, _, err := project_model.FindProjects(ctx, project_model.SearchOptions{ - RepoID: repo.ID, - Type: project_model.TypeRepository, - IsClosed: util.OptionalBoolOf(isShowClosed), - }) - if err != nil { - ctx.ServerError("GetProjects", err) - return - } - ctx.Data["Projects"] = projects + retrieveProjects(ctx, repo) + if ctx.Written() { + return } ctx.Data["IssueStats"] = issueStats diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index ad0ce50ec15fb..2e195a8c36b97 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -205,18 +205,38 @@ -
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
- {{.locale.Tr "repo.issues.new.no_projects"}} + {{.locale.Tr "repo.issues.new.clear_projects"}}
- {{range .Projects}} -
- {{.Title}} + {{if .OpenProjects}} +
+
+ {{.locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{.Title}} +
+ {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{.locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} +
+ {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{.Title}} +
+ {{end}}
{{end}}
From cd3f60a91496f8c0ada12052a9c8772f8635e225 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 29 Jan 2023 17:26:36 +0800 Subject: [PATCH 2/8] template improvement --- 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 0cfcb3655861f..59a5551210d85 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -223,7 +223,7 @@
-
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} From 34b7dc02712efb7a56f58d72bc940ac77ec403a0 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 29 Jan 2023 18:20:22 +0800 Subject: [PATCH 3/8] Fix filter --- models/issues/issue.go | 2 ++ options/locale/locale_en-US.ini | 3 ++- services/pull/pull.go | 1 - templates/repo/issue/list.tmpl | 34 +++++++++++++++++++++++++++------ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 50c9b77119974..26c8f33a8c68b 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1251,6 +1251,8 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { if opts.ProjectID > 0 { sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). And("project_issue.project_id=?", opts.ProjectID) + } else if opts.ProjectID == -1 { // -1 means not in any project + sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue"))) } if opts.ProjectBoardID != 0 { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 74ba85ca90161..70b06d7cb64fc 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1304,7 +1304,8 @@ issues.filter_label_no_select = All labels issues.filter_milestone = Milestone issues.filter_milestone_no_select = All milestones issues.filter_project = Project -issues.filter_project_no_select = All projects +issues.filter_project_all = All projects +issues.filter_project_none = No project issues.filter_assignee = Assignee issues.filter_assginee_no_select = All assignees issues.filter_poster = Author diff --git a/services/pull/pull.go b/services/pull/pull.go index c983c4f3e78ec..317875d2112d1 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -298,7 +298,6 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, } } - pr.Issue.PullRequest = pr notification.NotifyPullRequestSynchronized(ctx, doer, pr) } } diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 59a5551210d85..a78cf422bddd3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -76,19 +76,41 @@
-
+
- {{.locale.Tr "repo.issues.filter_project"}} + {{.locale.Tr "repo.issues.filter_projects"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{svg "octicon-search" 16}} - +
- {{.locale.Tr "repo.issues.filter_project_no_select"}} - {{range .Projects}} - {{.Title}} + {{.locale.Tr "repo.issues.filter_project_all"}} + {{.locale.Tr "repo.issues.filter_project_none"}} + {{if .OpenProjects}} +
+
+ {{.locale.Tr "repo.issues.new.open_projects"}} +
+ {{range .OpenProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{.Title}} + + {{end}} + {{end}} + {{if .ClosedProjects}} +
+
+ {{.locale.Tr "repo.issues.new.closed_projects"}} +
+ {{range .ClosedProjects}} + + {{if .IsOrganizationProject}}{{svg "octicon-project-symlink" 18 "mr-3"}}{{else}}{{svg "octicon-project" 18 "mr-3"}}{{end}} + {{.Title}} + + {{end}} {{end}}
From f70713ffd6a5de88135a8e38fb652dc8b6c9f781 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 29 Jan 2023 18:25:46 +0800 Subject: [PATCH 4/8] remove unnecessary change --- services/pull/pull.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services/pull/pull.go b/services/pull/pull.go index 317875d2112d1..c983c4f3e78ec 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -298,6 +298,7 @@ func AddTestPullRequestTask(doer *user_model.User, repoID int64, branch string, } } + pr.Issue.PullRequest = pr notification.NotifyPullRequestSynchronized(ctx, doer, pr) } } From 1cc4eb7ad81cb67cae676061374b6d1a137e381e Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 2 Feb 2023 14:47:26 +0800 Subject: [PATCH 5/8] Update templates/repo/issue/list.tmpl Co-authored-by: delvh --- 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 b187e2190e8aa..e6262ab038068 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -244,7 +244,7 @@
-
+
{{.locale.Tr "repo.project_board"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} From 98f5818bc76943ca9fc3f9c4436ca690e50798ce Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Thu, 2 Feb 2023 14:47:40 +0800 Subject: [PATCH 6/8] Update templates/repo/issue/list.tmpl Co-authored-by: delvh --- 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 e6262ab038068..cf2a2a6bbabaa 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -75,7 +75,7 @@
-
+
{{.locale.Tr "repo.issues.filter_projects"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} From d2c82a94a7dfaf9a69f156489619d9b1582a3536 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 3 Feb 2023 17:44:44 +0800 Subject: [PATCH 7/8] follow @delvh suggestion --- models/db/search.go | 6 ++++++ models/issues/issue.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/models/db/search.go b/models/db/search.go index f5273cb6f6bfa..26e082756a51b 100644 --- a/models/db/search.go +++ b/models/db/search.go @@ -27,3 +27,9 @@ const ( SearchOrderByForks SearchOrderBy = "num_forks ASC" SearchOrderByForksReverse SearchOrderBy = "num_forks DESC" ) + +const ( + // Which means a condition to filter the records which don't match any id. + // It's different from zero which means the condition could be ignored. + NoneID = -1 +) diff --git a/models/issues/issue.go b/models/issues/issue.go index 26c8f33a8c68b..024649676c839 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1251,7 +1251,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { if opts.ProjectID > 0 { sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). And("project_issue.project_id=?", opts.ProjectID) - } else if opts.ProjectID == -1 { // -1 means not in any project + } else if opts.ProjectID == db.NoneID { // -1 means not in any project sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue"))) } From c71c8c7c8c08e1f679af3e26644bf113606b224c Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 4 Feb 2023 20:35:09 +0800 Subject: [PATCH 8/8] Update models/issues/issue.go Co-authored-by: delvh --- models/issues/issue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/issues/issue.go b/models/issues/issue.go index 7afa9e9dac240..3ddc799270962 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -1251,7 +1251,7 @@ func (opts *IssuesOptions) setupSessionNoLimit(sess *xorm.Session) { if opts.ProjectID > 0 { sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id"). And("project_issue.project_id=?", opts.ProjectID) - } else if opts.ProjectID == db.NoneID { // -1 means not in any project + } else if opts.ProjectID == db.NoneID { // show those that are in no project sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue"))) }