Skip to content

Commit 88c3ccb

Browse files
6543zeripath
authored andcommitted
trim whitespace of MilestoneName at creation/rename (#10017)
1 parent 51f6a7a commit 88c3ccb

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

models/issue_milestone.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package models
66

77
import (
88
"fmt"
9+
"strings"
910

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

99+
m.Name = strings.TrimSpace(m.Name)
100+
98101
if _, err = sess.Insert(m); err != nil {
99102
return err
100103
}
@@ -272,6 +275,7 @@ func GetMilestones(repoID int64, page int, isClosed bool, sortType string) (Mile
272275
}
273276

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

models/issue_milestone_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,11 @@ func TestUpdateMilestone(t *testing.T) {
158158
assert.NoError(t, PrepareTestDatabase())
159159

160160
milestone := AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone)
161-
milestone.Name = "newMilestoneName"
161+
milestone.Name = " newMilestoneName "
162162
milestone.Content = "newMilestoneContent"
163163
assert.NoError(t, UpdateMilestone(milestone))
164-
AssertExistsAndLoadBean(t, milestone)
164+
milestone = AssertExistsAndLoadBean(t, &Milestone{ID: 1}).(*Milestone)
165+
assert.EqualValues(t, "newMilestoneName", milestone.Name)
165166
CheckConsistencyFor(t, &Milestone{})
166167
}
167168

0 commit comments

Comments
 (0)