Skip to content

Commit 2836219

Browse files
jaqralafriks
jaqra
authored andcommitted
Add 'Mentioning you' group to /issues page (#8201)
1 parent 04ca7f0 commit 2836219

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

models/issue.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,6 +1682,21 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
16821682
if err != nil {
16831683
return nil, err
16841684
}
1685+
case FilterModeMention:
1686+
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
1687+
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
1688+
And("issue_user.uid = ?", opts.UserID).
1689+
Count(new(Issue))
1690+
if err != nil {
1691+
return nil, err
1692+
}
1693+
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
1694+
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
1695+
And("issue_user.uid = ?", opts.UserID).
1696+
Count(new(Issue))
1697+
if err != nil {
1698+
return nil, err
1699+
}
16851700
}
16861701

16871702
cond = cond.And(builder.Eq{"issue.is_closed": opts.IsClosed})
@@ -1700,6 +1715,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
17001715
return nil, err
17011716
}
17021717

1718+
stats.MentionCount, err = x.Where(cond).
1719+
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
1720+
And("issue_user.uid = ?", opts.UserID).
1721+
Count(new(Issue))
1722+
if err != nil {
1723+
return nil, err
1724+
}
1725+
17031726
stats.YourRepositoriesCount, err = x.Where(cond).
17041727
And(builder.In("issue.repo_id", opts.UserRepoIDs)).
17051728
Count(new(Issue))

routers/user/home.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ func Issues(ctx *context.Context) {
181181
filterMode = models.FilterModeAssign
182182
case "created_by":
183183
filterMode = models.FilterModeCreate
184+
case "mentioned":
185+
filterMode = models.FilterModeMention
184186
case "all": // filterMode already set to All
185187
default:
186188
viewType = "all"

templates/user/dashboard/issues.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}
1919
<strong class="ui right">{{.IssueStats.CreateCount}}</strong>
2020
</a>
21+
<a class="{{if eq .ViewType "mentioned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=mentioned&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}">
22+
{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
23+
<strong class="ui right">{{.IssueStats.MentionCount}}</strong>
24+
</a>
2125
{{end}}
2226
<div class="ui divider"></div>
2327
{{range .Repos}}

0 commit comments

Comments
 (0)