Преглед на файлове

Add * to selected label

Unknown преди 10 години
родител
ревизия
bf5fcfb49c
променени са 2 файла, в които са добавени 5 реда и са изтрити 3 реда
  1. 3 1
      routers/repo/issue.go
  2. 2 2
      templates/issue/list.tmpl

+ 3 - 1
routers/repo/issue.go

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

+ 2 - 2
templates/issue/list.tmpl

@@ -18,10 +18,10 @@
                 <ul class="list-unstyled" id="label-list" data-ajax="{{$.RepoLink}}/issues/labels/delete">
                     {{range .Labels}}
                     <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="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 class="del pull-right" href="#" data-id="{{.Id}}"><i class="fa fa-times-circle-o"></i></a>
                     </li>