TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add * to selected label

Browse source
This commit is contained in:
Unknown 2014-05-25 23:46:45 -04:00
parent ff48aeddef
commit bf5fcfb49c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routers/repo/issue.go
View file

@ -65,6 +65,7 @@ func Issues(ctx *middleware.Context) {
mid = mile.Id mid = mile.Id
} }
selectLabels := ctx.Query("labels")
labels, err := models.GetLabels(ctx.Repo.Repository.Id) labels, err := models.GetLabels(ctx.Repo.Repository.Id)
if err != nil { if err != nil {
ctx.Handle(500, "issue.Issues(GetLabels): %v", err) ctx.Handle(500, "issue.Issues(GetLabels): %v", err)
@ -79,7 +80,7 @@ func Issues(ctx *middleware.Context) {
// Get issues. // Get issues.
issues, err := models.GetIssues(assigneeId, ctx.Repo.Repository.Id, posterId, mid, page, issues, err := models.GetIssues(assigneeId, ctx.Repo.Repository.Id, posterId, mid, page,
isShowClosed, ctx.Query("labels"), ctx.Query("sortType")) isShowClosed, selectLabels, ctx.Query("sortType"))
if err != nil { if err != nil {
ctx.Handle(500, "issue.Issues(GetIssues): %v", err) ctx.Handle(500, "issue.Issues(GetIssues): %v", err)
return return
@ -118,6 +119,7 @@ func Issues(ctx *middleware.Context) {
} }
issueStats := models.GetIssueStats(ctx.Repo.Repository.Id, uid, isShowClosed, filterMode) issueStats := models.GetIssueStats(ctx.Repo.Repository.Id, uid, isShowClosed, filterMode)
ctx.Data["IssueStats"] = issueStats ctx.Data["IssueStats"] = issueStats
ctx.Data["SelectLabels"], _ = base.StrTo(selectLabels).Int64()
ctx.Data["ViewType"] = viewType ctx.Data["ViewType"] = viewType
ctx.Data["Issues"] = issues ctx.Data["Issues"] = issues
ctx.Data["IsShowClosed"] = isShowClosed ctx.Data["IsShowClosed"] = isShowClosed

4
templates/issue/list.tmpl
View file

@ -18,10 +18,10 @@
<ul class="list-unstyled" id="label-list" data-ajax="{{$.RepoLink}}/issues/labels/delete"> <ul class="list-unstyled" id="label-list" data-ajax="{{$.RepoLink}}/issues/labels/delete">
{{range .Labels}} {{range .Labels}}
<li class="label-item" id="label-{{.Id}}" data-id="{{.Id}}"> <li class="label-item" id="label-{{.Id}}" data-id="{{.Id}}">
<a href="?type={{$.ViewType}}&state={{$.State}}&labels={{.Id}}"> <a href="?type={{$.ViewType}}&state={{$.State}}{{if not (eq $.SelectLabels .Id)}}&labels={{.Id}}{{end}}">
<span class="pull-right count">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</span> <span class="pull-right count">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</span>
<span class="color" style="background-color: {{.Color}}" data-color="{{.Color}}"></span> <span class="color" style="background-color: {{.Color}}" data-color="{{.Color}}"></span>
<span class="name">{{.Name}}</span> <span class="name">{{.Name}}{{if eq $.SelectLabels .Id}}*{{end}}</span>
</a> </a>
<a class="del pull-right" href="#" data-id="{{.Id}}"><i class="fa fa-times-circle-o"></i></a> <a class="del pull-right" href="#" data-id="{{.Id}}"><i class="fa fa-times-circle-o"></i></a>
</li> </li>