blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-18 23:12:17 +08:00
Code Issues Projects Releases Wiki Activity

fix bug that tag form:",default=1" are not effective in some cases

Browse Source
This commit is contained in:
Jerry 2020-05-06 23:46:22 +08:00
parent 235898e642
commit 57226d1bf9
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binding/form_mapping.go
View File

@ -158,12 +158,8 @@ func setByForm(value reflect.Value, field reflect.StructField, form map[string][
} }
return true, setArray(vs, value, field) return true, setArray(vs, value, field)
default: default:
var val string val := opt.defaultValue
if !ok { if len(vs) > 0 && vs[0] != "" {
val = opt.defaultValue
}
if len(vs) > 0 {
val = vs[0] val = vs[0]
} }
return true, setWithProperType(val, value, field) return true, setWithProperType(val, value, field)

19
binding/form_mapping_test.go
View File

@ -62,14 +62,25 @@ func TestMappingBaseTypes(t *testing.T) {
func TestMappingDefault(t *testing.T) { func TestMappingDefault(t *testing.T) {
var s struct { var s struct {
Int int `form:",default=9"` Int int `form:",default=9"`
Slice []int `form:",default=9"` PageNo int `form:"page_no,default=1"`
Array [1]int `form:",default=9"` PageSize int `form:"page_size,default=60"`
String string `form:"string,default=9"`
Slice []int `form:",default=9"`
Array [1]int `form:",default=9"`
} }
err := mappingByPtr(&s, formSource{}, "form") form := map[string][]string{
"page_no": {""},
"page_size": {""},
"string": {"test"},
}
err := mappingByPtr(&s, formSource(form), "form")
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, 9, s.Int) assert.Equal(t, 9, s.Int)
assert.Equal(t, 1, s.PageNo)
assert.Equal(t, 60, s.PageSize)
assert.Equal(t, "test", s.String)
assert.Equal(t, []int{9}, s.Slice) assert.Equal(t, []int{9}, s.Slice)
assert.Equal(t, [1]int{9}, s.Array) assert.Equal(t, [1]int{9}, s.Array)
} }