Browse Source

Add 'Mentioning you' group to /issues page (#8201)

for-closed-social
jaqra 5 years ago
committed by Lauris BH
parent
commit
28362195a0
3 changed files with 29 additions and 0 deletions
  1. +23
    -0
      models/issue.go
  2. +2
    -0
      routers/user/home.go
  3. +4
    -0
      templates/user/dashboard/issues.tmpl

+ 23
- 0
models/issue.go View File

@ -1682,6 +1682,21 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
case FilterModeMention:
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
And("issue_user.uid = ?", opts.UserID).
Count(new(Issue))
if err != nil {
return nil, err
}
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
And("issue_user.uid = ?", opts.UserID).
Count(new(Issue))
if err != nil {
return nil, err
}
} }
cond = cond.And(builder.Eq{"issue.is_closed": opts.IsClosed}) cond = cond.And(builder.Eq{"issue.is_closed": opts.IsClosed})
@ -1700,6 +1715,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
return nil, err return nil, err
} }
stats.MentionCount, err = x.Where(cond).
Join("INNER", "issue_user", "issue.id = issue_user.issue_id and issue_user.is_mentioned = ?", true).
And("issue_user.uid = ?", opts.UserID).
Count(new(Issue))
if err != nil {
return nil, err
}
stats.YourRepositoriesCount, err = x.Where(cond). stats.YourRepositoriesCount, err = x.Where(cond).
And(builder.In("issue.repo_id", opts.UserRepoIDs)). And(builder.In("issue.repo_id", opts.UserRepoIDs)).
Count(new(Issue)) Count(new(Issue))

+ 2
- 0
routers/user/home.go View File

@ -181,6 +181,8 @@ func Issues(ctx *context.Context) {
filterMode = models.FilterModeAssign filterMode = models.FilterModeAssign
case "created_by": case "created_by":
filterMode = models.FilterModeCreate filterMode = models.FilterModeCreate
case "mentioned":
filterMode = models.FilterModeMention
case "all": // filterMode already set to All case "all": // filterMode already set to All
default: default:
viewType = "all" viewType = "all"

+ 4
- 0
templates/user/dashboard/issues.tmpl View File

@ -18,6 +18,10 @@
{{.i18n.Tr "repo.issues.filter_type.created_by_you"}} {{.i18n.Tr "repo.issues.filter_type.created_by_you"}}
<strong class="ui right">{{.IssueStats.CreateCount}}</strong> <strong class="ui right">{{.IssueStats.CreateCount}}</strong>
</a> </a>
<a class="{{if eq .ViewType "mentioned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=mentioned&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}">
{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}
<strong class="ui right">{{.IssueStats.MentionCount}}</strong>
</a>
{{end}} {{end}}
<div class="ui divider"></div> <div class="ui divider"></div>
{{range .Repos}} {{range .Repos}}

Loading…
Cancel
Save