diff options
| -rw-r--r-- | models/issue.go | 23 | ||||
| -rw-r--r-- | routers/user/home.go | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 4 |
3 files changed, 29 insertions, 0 deletions
diff --git a/models/issue.go b/models/issue.go index 511bfa31c4..87e64ce99b 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1682,6 +1682,21 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { if err != nil { 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}) @@ -1700,6 +1715,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { 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). And(builder.In("issue.repo_id", opts.UserRepoIDs)). Count(new(Issue)) diff --git a/routers/user/home.go b/routers/user/home.go index 0c7dfec7f5..40b3bc3fc1 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -181,6 +181,8 @@ func Issues(ctx *context.Context) { filterMode = models.FilterModeAssign case "created_by": filterMode = models.FilterModeCreate + case "mentioned": + filterMode = models.FilterModeMention case "all": // filterMode already set to All default: viewType = "all" diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index 092eb9c7e8..b1d0ee4193 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -18,6 +18,10 @@ {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} <strong class="ui right">{{.IssueStats.CreateCount}}</strong> </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}} <div class="ui divider"></div> {{range .Repos}} |