Browse Source

trim whitespace of MilestoneName at creation/rename (#10017)

tags/v1.10.5
6543 4 years ago
parent
commit
88c3ccb897
2 changed files with 7 additions and 2 deletions
  1. 4
    0
      models/issue_milestone.go
  2. 3
    2
      models/issue_milestone_test.go

+ 4
- 0
models/issue_milestone.go View File



import ( import (
"fmt" "fmt"
"strings"


"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs" api "code.gitea.io/gitea/modules/structs"
return err return err
} }


m.Name = strings.TrimSpace(m.Name)

if _, err = sess.Insert(m); err != nil { if _, err = sess.Insert(m); err != nil {
return err return err
} }
} }


func updateMilestone(e Engine, m *Milestone) error { func updateMilestone(e Engine, m *Milestone) error {
m.Name = strings.TrimSpace(m.Name)
_, err := e.ID(m.ID).AllCols(). _, err := e.ID(m.ID).AllCols().
SetExpr("num_issues", builder.Select("count(*)").From("issue").Where( SetExpr("num_issues", builder.Select("count(*)").From("issue").Where(
builder.Eq{"milestone_id": m.ID}, builder.Eq{"milestone_id": m.ID},

+ 3
- 2
models/issue_milestone_test.go View File

assert.NoError(t, PrepareTestDatabase()) assert.NoError(t, PrepareTestDatabase())


milestone := AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone) milestone := AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone)
milestone.Name = "newMilestoneName"
milestone.Name = " newMilestoneName "
milestone.Content = "newMilestoneContent" milestone.Content = "newMilestoneContent"
assert.NoError(t, UpdateMilestone(milestone)) assert.NoError(t, UpdateMilestone(milestone))
AssertExistsAndLoadBean(t, milestone)
milestone = AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone)
assert.EqualValues(t, "newMilestoneName", milestone.Name)
CheckConsistencyFor(t, &Milestone{}) CheckConsistencyFor(t, &Milestone{})
} }



Loading…
Cancel
Save