Skip to content

Commit 5d80044

Browse files
committed
rename some variables and functions
1 parent 01252ba commit 5d80044

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

models/issue_label.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ func (label *Label) CalOpenIssues() {
7878
label.NumOpenIssues = label.NumIssues - label.NumClosedIssues
7979
}
8080

81-
// CalQueryString calculates query string in issue/pulls list
82-
func (label *Label) CalQueryString(query []string) {
81+
// LoadSelectedLabelsAfterClick calculates the set of selected labels when a label is clicked
82+
func (label *Label) LoadSelectedLabelsAfterClick(currentSelectedLabels []string) {
8383
var labelQuerySlice []string
8484
labelSelected := false
8585
labelID := fmt.Sprint(label.ID)
86-
for _, s := range query {
86+
for _, s := range currentSelectedLabels {
8787
if s == labelID {
8888
labelSelected = true
8989
} else if s != "" {

routers/repo/issue_label.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,17 @@ func RetrieveLabels(ctx *context.Context) {
7171
ctx.Data["SortType"] = ctx.Query("sort")
7272
}
7373

74-
// RetreveLabelsAndCalQueryString calculate query string when filtering issues/pulls
75-
func RetreveLabelsAndCalQueryString(ctx *context.Context) {
74+
// RetrieveLabelsAndLoadSelectedLabels calculate query string when filtering issues/pulls
75+
func RetrieveLabelsAndLoadSelectedLabels(ctx *context.Context) {
7676
labels, err := models.GetLabelsByRepoID(ctx.Repo.Repository.ID, ctx.Query("sort"))
7777
if err != nil {
78-
ctx.ServerError("RetreveLabelsAndCalQueryString.GetLabels", err)
78+
ctx.ServerError("RetrieveLabelsAndLoadSelectedLabels.GetLabels", err)
7979
return
8080
}
81-
selectLabelsSlice := strings.Split(ctx.Query("labels"), ",")
81+
selectLabels := strings.Split(ctx.Query("labels"), ",")
8282
for _, l := range labels {
8383
l.CalOpenIssues()
84-
l.CalQueryString(selectLabelsSlice)
84+
l.LoadSelectedLabelsAfterClick(selectLabels)
8585
}
8686
ctx.Data["Labels"] = labels
8787
ctx.Data["NumLabels"] = len(labels)

routers/routes/routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ func RegisterRoutes(m *macaron.Macaron) {
585585

586586
m.Group("/:username/:reponame", func() {
587587
m.Group("", func() {
588-
m.Get("/^:type(issues|pulls)$", repo.RetreveLabelsAndCalQueryString, repo.Issues)
588+
m.Get("/^:type(issues|pulls)$", repo.RetrieveLabelsAndLoadSelectedLabels, repo.Issues)
589589
m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue)
590590
m.Get("/labels/", context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests), repo.RetrieveLabels, repo.Labels)
591591
m.Get("/milestones", context.CheckAnyUnit(models.UnitTypeIssues, models.UnitTypePullRequests), repo.Milestones)

0 commit comments

Comments
 (0)