Browse Source

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

tags/v1.11.0
6543 Lunny Xiao 3 weeks ago
parent
commit
315026c2c5
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

@@ -6,6 +6,7 @@ package models

import (
"fmt"
"strings"

"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
@@ -95,6 +96,8 @@ func NewMilestone(m *Milestone) (err error) {
return err
}

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

if _, err = sess.Insert(m); err != nil {
return err
}
@@ -268,6 +271,7 @@ func GetMilestones(repoID int64, page int, isClosed bool, sortType string) (Mile
}

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


+ 3
- 2
models/issue_milestone_test.go View File

@@ -158,10 +158,11 @@ func TestUpdateMilestone(t *testing.T) {
assert.NoError(t, PrepareTestDatabase())

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



Loading…
Cancel
Save