Skip to content

Commit 7a171ec

Browse files
yp05327yp05327
committed
improve
1 parent 6af34c0 commit 7a171ec

File tree

6 files changed

+40
-47
lines changed

6 files changed

+40
-47
lines changed

‎routers/web/repo/issue.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,10 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
417417
ctx.Data["PinnedIssues"] = pinned
418418
ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.Doer.IsAdmin)
419419
ctx.Data["IssueStats"] = issueStats
420+
ctx.Data["OpenCount"] = issueStats.OpenCount
421+
ctx.Data["ClosedCount"] = issueStats.ClosedCount
422+
ctx.Data["OpenLink"] = fmt.Sprintf("%s?q=%s&type=%s&sort=%s&state=open&labels=%s&milestone=%d&project=%d&assignee=%d&poster=%d", ctx.Link, keyword, viewType, sortType, selectLabels, mentionedID, projectID, assigneeID, posterID)
423+
ctx.Data["ClosedLink"] = fmt.Sprintf("%s?q=%s&type=%s&sort=%s&state=closed&labels=%s&milestone=%d&project=%d&assignee=%d&poster=%d", ctx.Link, keyword, viewType, sortType, selectLabels, mentionedID, projectID, assigneeID, posterID)
420424
ctx.Data["SelLabelIDs"] = labelIDs
421425
ctx.Data["SelectLabels"] = selectLabels
422426
ctx.Data["ViewType"] = viewType

‎routers/web/repo/milestone.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package repo
55

66
import (
7+
"fmt"
78
"net/http"
89
"net/url"
910
"time"
@@ -72,6 +73,8 @@ func Milestones(ctx *context.Context) {
7273
}
7374
ctx.Data["OpenCount"] = stats.OpenCount
7475
ctx.Data["ClosedCount"] = stats.ClosedCount
76+
ctx.Data["OpenLink"] = fmt.Sprintf("%s/milestones?state=open&q=%s", ctx.Repo.RepoLink, keyword)
77+
ctx.Data["ClosedLink"] = fmt.Sprintf("%s/milestones?state=closed&q=%s", ctx.Repo.RepoLink, keyword)
7578

7679
if ctx.Repo.Repository.IsTimetrackerEnabled(ctx) {
7780
if err := miles.LoadTotalTrackedTimes(ctx); err != nil {

‎templates/repo/issue/filters.tmpl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@
77
</div>
88
<div class="issue-list-toolbar-right">
99
<div class="ui secondary filter menu labels">
10+
{{if .PageIsMilestones}}
11+
<!-- Sort -->
12+
<div class="list-header-sort ui small dropdown type jump item">
13+
<span class="text">
14+
{{.locale.Tr "repo.issues.filter_sort"}}
15+
</span>
16+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
17+
<div class="menu">
18+
<a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.earliest_due_data"}}</a>
19+
<a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.latest_due_date"}}</a>
20+
<a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a>
21+
<a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a>
22+
<a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a>
23+
<a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a>
24+
</div>
25+
</div>
26+
{{else}}
1027
<!-- Label -->
1128
<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item label-filter">
1229
<span class="text">
@@ -192,6 +209,7 @@
192209
<a class="{{if eq .SortType "farduedate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort=farduedate&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_sort.farduedate"}}</a>
193210
</div>
194211
</div>
212+
{{end}}
195213
</div>
196214
</div>
197215
</div>

‎templates/repo/issue/milestones.tmpl

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,17 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository milestones">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar gt-mb-4">
5+
{{template "base/alert" .}}
6+
7+
<div class="list-header">
68
{{template "repo/issue/navbar" .}}
9+
{{template "repo/issue/search" .}}
710
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
811
<a class="ui small primary button" href="{{$.Link}}/new">{{.locale.Tr "repo.milestones.new"}}</a>
912
{{end}}
1013
</div>
11-
{{template "base/alert" .}}
1214

13-
<div class="list-header">
14-
<div class="small-menu-items ui compact tiny menu list-header-toggle">
15-
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}">
16-
{{svg "octicon-milestone" 16 "gt-mr-3"}}
17-
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
18-
</a>
19-
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=closed&q={{$.Keyword}}">
20-
{{svg "octicon-check" 16 "gt-mr-3"}}
21-
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
22-
</a>
23-
</div>
24-
25-
<!-- Search -->
26-
<form class="list-header-search ui form ignore-dirty">
27-
<div class="ui small search fluid action input">
28-
<input type="hidden" name="state" value="{{$.State}}">
29-
{{template "shared/searchinput" dict "Value" .Keyword}}
30-
<button class="ui small icon button" type="submit" aria-label="{{.locale.Tr "explore.search"}}">
31-
{{svg "octicon-search"}}
32-
</button>
33-
</div>
34-
</form>
35-
36-
<!-- Sort -->
37-
<div class="list-header-sort ui small dropdown type jump item">
38-
<span class="text">
39-
{{.locale.Tr "repo.issues.filter_sort"}}
40-
</span>
41-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
42-
<div class="menu">
43-
<a class="{{if or (eq .SortType "closestduedate") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=closestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.earliest_due_data"}}</a>
44-
<a class="{{if eq .SortType "furthestduedate"}}active {{end}}item" href="{{$.Link}}?sort=furthestduedate&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.latest_due_date"}}</a>
45-
<a class="{{if eq .SortType "leastcomplete"}}active {{end}}item" href="{{$.Link}}?sort=leastcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_complete"}}</a>
46-
<a class="{{if eq .SortType "mostcomplete"}}active {{end}}item" href="{{$.Link}}?sort=mostcomplete&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_complete"}}</a>
47-
<a class="{{if eq .SortType "mostissues"}}active {{end}}item" href="{{$.Link}}?sort=mostissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.most_issues"}}</a>
48-
<a class="{{if eq .SortType "leastissues"}}active {{end}}item" href="{{$.Link}}?sort=leastissues&state={{$.State}}&q={{$.Keyword}}">{{.locale.Tr "repo.milestones.filter_sort.least_issues"}}</a>
49-
</div>
50-
</div>
51-
</div>
15+
{{template "repo/issue/filters" .}}
5216

5317
<!-- milestone list -->
5418
<div class="milestone-list">

‎templates/repo/issue/openclose.tmpl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<div class="small-menu-items ui compact tiny menu">
2-
<a class="{{if not .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}">
3-
{{if .PageIsPullList}}
2+
<a class="{{if not .IsShowClosed}}active {{end}}item" href="{{.OpenLink}}">
3+
{{if .PageIsMilestones}}
4+
{{svg "octicon-milestone" 16 "gt-mr-3"}}
5+
{{else if .PageIsPullList}}
46
{{svg "octicon-git-pull-request" 16 "gt-mr-3"}}
57
{{else}}
68
{{svg "octicon-issue-opened" 16 "gt-mr-3"}}
79
{{end}}
8-
{{.locale.PrettyNumber .IssueStats.OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
10+
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
911
</a>
10-
<a class="{{if .IsShowClosed}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&type={{.ViewType}}&sort={{$.SortType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&project={{.ProjectID}}&assignee={{.AssigneeID}}&poster={{.PosterID}}">
12+
<a class="{{if .IsShowClosed}}active {{end}}item" href="{{.ClosedLink}}">
1113
{{svg "octicon-check" 16 "gt-mr-3"}}
12-
{{.locale.PrettyNumber .IssueStats.ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
14+
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
1315
</a>
1416
</div>

‎templates/repo/issue/search.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<form class="list-header-search ui form ignore-dirty issue-list-search">
22
<div class="ui small search fluid action input">
3-
<input type="hidden" name="type" value="{{$.ViewType}}">
43
<input type="hidden" name="state" value="{{$.State}}">
4+
{{if not .PageIsMilestones}}
5+
<input type="hidden" name="type" value="{{$.ViewType}}">
56
<input type="hidden" name="labels" value="{{.SelectLabels}}">
67
<input type="hidden" name="milestone" value="{{$.MilestoneID}}">
78
<input type="hidden" name="project" value="{{$.ProjectID}}">
89
<input type="hidden" name="assignee" value="{{$.AssigneeID}}">
910
<input type="hidden" name="poster" value="{{$.PosterID}}">
11+
{{end}}
1012
{{template "shared/searchinput" dict "Value" .Keyword}}
1113
{{if .PageIsIssueList}}
1214
<button id="issue-list-quick-goto" class="ui small icon button gt-hidden" data-tooltip-content="{{.locale.Tr "explore.go_to"}}" data-repo-link="{{.RepoLink}}">{{svg "octicon-hash"}}</button>

0 commit comments

Comments
 (0)