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

templateform.RenderForm now renders textarea

Browse Source 
When RenderForm encounters a field with the structTag `form` value
type `textarea` it renders an actual <textarea> html tag.
This commit is contained in:
Vangelis Tsoumenis 2014-06-29 20:30:11 +02:00
parent a991b9dcde
commit 4994d36b66
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
templatefunc.go
View File

@ -327,7 +327,6 @@ func ParseForm(form url.Values, obj interface{}) error {
return nil return nil
} }
var unKind = map[reflect.Kind]bool{ var unKind = map[reflect.Kind]bool{
reflect.Uintptr: true, reflect.Uintptr: true,
reflect.Complex64: true, reflect.Complex64: true,
@ -367,12 +366,30 @@ func RenderForm(obj interface{}) template.HTML {
continue continue
} }
raw = append(raw, fmt.Sprintf(`%v<input name="%v" type="%v" value="%v">`, raw = append(raw, renderFormField(label, name, fType, fieldV.Interface()))
label, name, fType, fieldV.Interface()))
} }
return template.HTML(strings.Join(raw, "</br>")) return template.HTML(strings.Join(raw, "</br>"))
} }
func renderFormField(label, name, fType string, value interface{}) string {
if isValidForInput(fType) {
return fmt.Sprintf(`%v<input name="%v" type="%v" value="%v">`, label, name, fType, value)
}
return fmt.Sprintf(`%v<%v name="%v">%v</%v>`, label, fType, name, value, fType)
}
func isValidForInput(fType string) bool {
validInputTypes := strings.Fields("text password checkbox radio submit reset hidden image file button")
for _, validType := range validInputTypes {
if fType == validType {
return true
}
}
return false
}
// parseFormTag takes the stuct-tag of a StructField and parses the `form` value. // parseFormTag takes the stuct-tag of a StructField and parses the `form` value.
// returned are the form label, name-property, type and wether the field should be ignored. // returned are the form label, name-property, type and wether the field should be ignored.
func parseFormTag(fieldT reflect.StructField) (label, name, fType string, ignored bool) { func parseFormTag(fieldT reflect.StructField) (label, name, fType string, ignored bool) {

17
templatefunc_test.go
View File

@ -148,9 +148,10 @@ func TestRenderForm(t *testing.T) {
Sex string Sex string
Email []string Email []string
Intro string `form:",textarea"` Intro string `form:",textarea"`
Ignored string `form:"-"`
} }
u := user{Name: "test"} u := user{Name: "test", Intro: "Some Text"}
output := RenderForm(u) output := RenderForm(u)
if output != template.HTML("") { if output != template.HTML("") {
t.Errorf("output should be empty but got %v", output) t.Errorf("output should be empty but got %v", output)
@ -160,12 +161,24 @@ func TestRenderForm(t *testing.T) {
`Name: <input name="username" type="text" value="test"></br>` + `Name: <input name="username" type="text" value="test"></br>` +
`年龄：<input name="age" type="text" value="0"></br>` + `年龄：<input name="age" type="text" value="0"></br>` +
`Sex: <input name="Sex" type="text" value=""></br>` + `Sex: <input name="Sex" type="text" value=""></br>` +
`Intro: <input name="Intro" type="textarea" value="">`) `Intro: <textarea name="Intro">Some Text</textarea>`)
if output != result { if output != result {
t.Errorf("output should equal `%v` but got `%v`", result, output) t.Errorf("output should equal `%v` but got `%v`", result, output)
} }
} }
func TestRenderFormField(t *testing.T) {
html := renderFormField("Label: ", "Name", "text", "Value")
if html != `Label: <input name="Name" type="text" value="Value">` {
t.Errorf("Wrong html output for input[type=text]: %v ", html)
}
html = renderFormField("Label: ", "Name", "textarea", "Value")
if html != `Label: <textarea name="Name">Value</textarea>` {
t.Errorf("Wrong html output for textarea: %v ", html)
}
}
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 {