trim whitespace of MilestoneName at creation/rename (#10017)
This commit is contained in:
		
							parent
							
								
									51f6a7ab10
								
							
						
					
					
						commit
						88c3ccb897
					
				
					 2 changed files with 7 additions and 2 deletions
				
			
		|  | @ -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 | ||||
| 	} | ||||
|  | @ -272,6 +275,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}, | ||||
|  |  | |||
|  | @ -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…
	
		Reference in a new issue