From 177fc20cce4d2e46f985a57bbaa0ce7b26d88fab Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 19 Dec 2019 13:37:23 +0100 Subject: [PATCH 1/8] prepare template --- templates/repo/issue/list.tmpl | 52 ++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0b618daaa9d65..426e031c0b087 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -41,6 +41,7 @@
+
@@ -49,9 +50,9 @@
{{.i18n.Tr "repo.issues.filter_label_exclude" | Safe}} - {{.i18n.Tr "repo.issues.filter_label_no_select"}} + {{.i18n.Tr "repo.issues.filter_label_no_select"}} {{range .Labels}} - {{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if .IsSelected}}{{svg "octicon-check" 16}}{{end}} {{.Name}} + {{if .IsExcluded}}{{svg "octicon-circle-slash" 16}}{{else if .IsSelected}}{{svg "octicon-check" 16}}{{end}} {{.Name}} {{end}}
@@ -63,9 +64,9 @@
- {{.i18n.Tr "repo.issues.filter_milestone_no_select"}} + {{.i18n.Tr "repo.issues.filter_milestone_no_select"}} {{range .Milestones}} - {{.Name}} + {{.Name}} {{end}}
@@ -77,13 +78,27 @@
- {{.i18n.Tr "repo.issues.filter_assginee_no_select"}} + {{.i18n.Tr "repo.issues.filter_assginee_no_select"}} {{range .Assignees}} - {{.GetDisplayName}} + {{.GetDisplayName}} {{end}}
+ +
+ + {{.i18n.Tr "repo.issues.filter_authors"}} + + +
+ {{.i18n.Tr "repo.issues.filter_author_no_select"}} + {{range .Authors}} + {{.GetDisplayName}} + {{end}} +
+
+ {{if .IsSigned}}
@@ -92,10 +107,10 @@
- {{.i18n.Tr "repo.issues.filter_type.all_issues"}} - {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} - {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} - {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} + {{.i18n.Tr "repo.issues.filter_type.all_issues"}} + {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} + {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
{{end}} @@ -107,16 +122,17 @@
- {{.i18n.Tr "repo.issues.filter_sort.latest"}} - {{.i18n.Tr "repo.issues.filter_sort.oldest"}} - {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} - {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}} - {{.i18n.Tr "repo.issues.filter_sort.nearduedate"}} - {{.i18n.Tr "repo.issues.filter_sort.farduedate"}} + {{.i18n.Tr "repo.issues.filter_sort.latest"}} + {{.i18n.Tr "repo.issues.filter_sort.oldest"}} + {{.i18n.Tr "repo.issues.filter_sort.recentupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.leastupdate"}} + {{.i18n.Tr "repo.issues.filter_sort.mostcomment"}} + {{.i18n.Tr "repo.issues.filter_sort.leastcomment"}} + {{.i18n.Tr "repo.issues.filter_sort.nearduedate"}} + {{.i18n.Tr "repo.issues.filter_sort.farduedate"}}
+ From 4cdecac2368db350ecaae6aa28fb4b9ca27f4a22 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 19 Dec 2019 15:40:34 +0100 Subject: [PATCH 2/8] add locales --- options/locale/locale_en-US.ini | 2 ++ templates/repo/issue/list.tmpl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index dbd1a3680d595..3fc6fc7736f26 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -855,6 +855,8 @@ issues.filter_milestone = Milestone issues.filter_milestone_no_select = All milestones issues.filter_assignee = Assignee issues.filter_assginee_no_select = All assignees +issues.filter_author = Author +issues.filter_author_no_select = All authors issues.filter_type = Type issues.filter_type.all_issues = All issues issues.filter_type.assigned_to_you = Assigned to you diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 426e031c0b087..207084b5e3d00 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -88,7 +88,7 @@
- {{.i18n.Tr "repo.issues.filter_authors"}} + {{.i18n.Tr "repo.issues.filter_author"}}
From c9639e1f0fa9ec7e0dfb76b880edb31b2a085c89 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 19 Dec 2019 19:16:53 +0100 Subject: [PATCH 3/8] add functions to get IssueAuthors per repo --- models/repo.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/models/repo.go b/models/repo.go index 4bb5e3eb01e43..cbc5c756d96b6 100644 --- a/models/repo.go +++ b/models/repo.go @@ -616,12 +616,24 @@ func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) { return users, nil } +func (repo *Repository) getIssueAuthors(e Engine) (authors []*User, err error) { + err = e.Where("issue.repo_id = ?", repo.ID). + Join("LEFT", "user", "user.id = issue.poster_id").OrderBy("user.id"). + GroupBy("user.id").Select("user.id, user.name, user.full_name").Find(authors) + + return +} + // GetAssignees returns all users that have write access and can be assigned to issues // of the repository, func (repo *Repository) GetAssignees() (_ []*User, err error) { return repo.getAssignees(x) } +func (repo *Repository) GetIssueAuthors() (_ []*User, err error) { + return repo.getIssueAuthors(x) +} + // GetMilestoneByID returns the milestone belongs to repository by given ID. func (repo *Repository) GetMilestoneByID(milestoneID int64) (*Milestone, error) { return GetMilestoneByRepoID(repo.ID, milestoneID) From c0f82bcc60010e5cf09ca7ac5d1d7e0b38339b8c Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Thu, 19 Dec 2019 18:15:53 +0100 Subject: [PATCH 4/8] first working example if ... you replace "ctx.Data["Authors"], err = repo.GetIssueAuthors()" with "ctx.Data["Authors"], err = repo.GetAssignees()" --- models/repo.go | 21 ++++++++++++--------- routers/repo/issue.go | 11 ++++++++++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/models/repo.go b/models/repo.go index cbc5c756d96b6..c7ec42dc9f846 100644 --- a/models/repo.go +++ b/models/repo.go @@ -616,22 +616,25 @@ func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) { return users, nil } -func (repo *Repository) getIssueAuthors(e Engine) (authors []*User, err error) { - err = e.Where("issue.repo_id = ?", repo.ID). - Join("LEFT", "user", "user.id = issue.poster_id").OrderBy("user.id"). - GroupBy("user.id").Select("user.id, user.name, user.full_name").Find(authors) - - return +func (repo *Repository) getIssueAuthors(e Engine, lim int, keyword string) (authors []*User, err error) { + var authorIDs []int64 + if err = e.SQL("SELECT user.id FROM issue,user WHERE user.id = issue.poster_id AND issue.repo_id = ? AND user.name LIKE '%"+keyword+"%' GROUP BY user.id ORDER BY user.id", repo.ID). + Limit(lim, 0).Find(&authorIDs); err != nil { + return nil, err + } + return GetUsersByIDs(authorIDs) } // GetAssignees returns all users that have write access and can be assigned to issues // of the repository, -func (repo *Repository) GetAssignees() (_ []*User, err error) { +func (repo *Repository) GetAssignees() ([]*User, error) { return repo.getAssignees(x) } -func (repo *Repository) GetIssueAuthors() (_ []*User, err error) { - return repo.getIssueAuthors(x) +// GetIssueAuthors return the first 15 users who have created an issue in this repo +// the users can be specified by a keyword +func (repo *Repository) GetIssueAuthors(keyword string) ([]*User, error) { + return repo.getIssueAuthors(x, 15, keyword) } // GetMilestoneByID returns the milestone belongs to repository by given ID. diff --git a/routers/repo/issue.go b/routers/repo/issue.go index fdade2795d164..3e7fccdcb360e 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -115,7 +115,8 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB var ( assigneeID = ctx.QueryInt64("assignee") - posterID int64 + posterID = ctx.QueryInt64("author") + authorID = posterID mentionedID int64 forceEmpty bool ) @@ -248,6 +249,13 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB return } + // Get issue authors + ctx.Data["Authors"], err = repo.GetIssueAuthors("") + if err != nil { + ctx.ServerError("GetIssueAuthors", err) + return + } + labels, err := models.GetLabelsByRepoID(repo.ID, "", models.ListOptions{}) if err != nil { ctx.ServerError("GetLabelsByRepoID", err) @@ -270,6 +278,7 @@ func issues(ctx *context.Context, milestoneID int64, isPullOption util.OptionalB ctx.Data["SortType"] = sortType ctx.Data["MilestoneID"] = milestoneID ctx.Data["AssigneeID"] = assigneeID + ctx.Data["AuthorID"] = authorID ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["Keyword"] = keyword if isShowClosed { From e188a40787e180354ad37b5f8a9aa3e243f27f47 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 11 Dec 2020 17:30:37 +0100 Subject: [PATCH 5/8] addapt latest changes --- templates/repo/issue/list.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index a8175cb36930a..d4906358b7c03 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -82,12 +82,14 @@
{{.i18n.Tr "repo.issues.filter_author"}} - + {{svg "octicon-triangle-down" 14 "dropdown icon"}}
{{.i18n.Tr "repo.issues.filter_author_no_select"}} {{range .Authors}} - {{.GetDisplayName}} + + {{avatar .}} + {{end}}
@@ -101,7 +103,7 @@
{{.i18n.Tr "repo.issues.filter_type.all_issues"}} - {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} + {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
From 9e3221369421a4032b6494e21b6039d6a6c027b9 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 4 Jan 2022 05:28:21 +0100 Subject: [PATCH 6/8] Update templates/repo/issue/list.tmpl --- templates/repo/issue/list.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index c5e6eacdd7335..0e4334256fce3 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -130,7 +130,6 @@ {{.i18n.Tr "repo.issues.filter_sort.farduedate"}}
- From 0cfdb049a62785e5d9346fb397c6a867bd47138f Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 4 Jan 2022 05:34:51 +0100 Subject: [PATCH 7/8] fix ui --- templates/repo/issue/list.tmpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0e4334256fce3..d6385d93e9d6b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -32,7 +32,6 @@
-
@@ -88,7 +87,7 @@ {{.i18n.Tr "repo.issues.filter_author_no_select"}} {{range .Authors}} - {{avatar .}} + {{avatar .}} {{.GetDisplayName}} {{end}}
From 1bf51615d59f39865ac74abcfda7f9bebe67d0a0 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 4 Jan 2022 05:40:15 +0100 Subject: [PATCH 8/8] no sql injection --- models/repo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo.go b/models/repo.go index 8a437a48b4bd9..13680c9ec4f62 100644 --- a/models/repo.go +++ b/models/repo.go @@ -179,7 +179,7 @@ func getRepoAssignees(ctx context.Context, repo *repo_model.Repository) (_ []*us func getRepoIssueAuthors(ctx context.Context, repoID int64, lim int, keyword string) (authors []*user_model.User, err error) { var authorIDs []int64 - if err = db.GetEngine(ctx).SQL("SELECT user.id FROM issue,user WHERE user.id = issue.poster_id AND issue.repo_id = ? AND user.name LIKE '%"+keyword+"%' GROUP BY user.id ORDER BY user.id", repoID). + if err = db.GetEngine(ctx).SQL("SELECT user.id FROM issue,user WHERE user.id = issue.poster_id AND issue.repo_id = ? AND user.name LIKE '%?%' GROUP BY user.id ORDER BY user.id", repoID, keyword). Limit(lim, 0).Find(&authorIDs); err != nil { return nil, err }