lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-01 03:20:55 +00:00
Code Issues Releases Activity

Change meta to required, and refactor a bit to cover edge cases

Browse Source
This commit is contained in:
Joshua Santos 2016-06-30 10:32:53 -07:00
parent 84b6bef7d0
commit e0393b721c
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
templatefunc.go
View File

@ -475,13 +475,10 @@ func parseFormTag(fieldT reflect.StructField) (label, name, fType string, id str
id = fieldT.Tag.Get("id") id = fieldT.Tag.Get("id")
class = fieldT.Tag.Get("class") class = fieldT.Tag.Get("class")
meta := strings.Split(fieldT.Tag.Get("meta"), ",")
required = false required = false
switch len(meta) { required_field := fieldT.Tag.Get("required")
case 1: if required_field != "-" && required_field != "" {
if len(meta[0]) > 0 && meta[0] != "-" { required, _ = strconv.ParseBool(required_field)
required = true
}
} }
switch len(tags) { switch len(tags) {

24
templatefunc_test.go
View File

@ -214,12 +214,14 @@ func TestRenderFormField(t *testing.T) {
func TestParseFormTag(t *testing.T) { func TestParseFormTag(t *testing.T) {
// create struct to contain field with different types of struct-tag `form` // create struct to contain field with different types of struct-tag `form`
type user struct { type user struct {
All int `form:"name,text,年龄："` All int `form:"name,text,年龄："`
NoName int `form:",hidden,年龄："` NoName int `form:",hidden,年龄："`
OnlyLabel int `form:",,年龄："` OnlyLabel int `form:",,年龄："`
OnlyName int `form:"name" id:"name" class:"form-name"` OnlyName int `form:"name" id:"name" class:"form-name"`
Ignored int `form:"-"` Ignored int `form:"-"`
Required int `form:"name" meta:"true"` Required int `form:"name" required:"true"`
IgnoreRequired int `form:"name"`
NotRequired int `form:"name" required:"false"`
} }
objT := reflect.TypeOf(&user{}).Elem() objT := reflect.TypeOf(&user{}).Elem()
@ -255,6 +257,16 @@ func TestParseFormTag(t *testing.T) {
t.Errorf("Form Tag containing only name and required was not correctly parsed.") t.Errorf("Form Tag containing only name and required was not correctly parsed.")
} }
label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(6))
if !(name == "name" && required == false) {
t.Errorf("Form Tag containing only name and ignore required was not correctly parsed.")
}
label, name, fType, id, class, ignored, required = parseFormTag(objT.Field(7))
if !(name == "name" && required == false) {
t.Errorf("Form Tag containing only name and not required was not correctly parsed.")
}
} }
func TestMapGet(t *testing.T) { func TestMapGet(t *testing.T) {