mirror of
https://github.com/astaxie/beego.git
synced 2024-12-22 22:20:50 +00:00
defValue -> defaultValue
This commit is contained in:
parent
d3a16dca85
commit
cb4f252a06
@ -24,7 +24,7 @@ func convertParam(param *MethodParam, paramType reflect.Type, ctx *beecontext.Co
|
||||
if param.required {
|
||||
ctx.Abort(400, fmt.Sprintf("Missing parameter %s", param.name))
|
||||
} else {
|
||||
paramValue = param.defValue
|
||||
paramValue = param.defaultValue
|
||||
}
|
||||
}
|
||||
|
||||
@ -43,9 +43,6 @@ func getParamValue(param *MethodParam, ctx *beecontext.Context) string {
|
||||
return string(ctx.Input.RequestBody)
|
||||
case header:
|
||||
return ctx.Input.Header(param.name)
|
||||
// if strValue == "" && strings.Contains(param.name, "_") { //magically handle X-Headers?
|
||||
// strValue = ctx.Input.Header(strings.Replace(param.name, "_", "-", -1))
|
||||
// }
|
||||
case path:
|
||||
return ctx.Input.Query(":" + param.name)
|
||||
default:
|
||||
|
@ -7,10 +7,10 @@ import (
|
||||
|
||||
//MethodParam keeps param information to be auto passed to controller methods
|
||||
type MethodParam struct {
|
||||
name string
|
||||
location paramLocation
|
||||
required bool
|
||||
defValue string
|
||||
name string
|
||||
location paramLocation
|
||||
required bool
|
||||
defaultValue string
|
||||
}
|
||||
|
||||
type paramLocation byte
|
||||
@ -57,8 +57,8 @@ func (mp *MethodParam) String() string {
|
||||
case header:
|
||||
options = append(options, "param.InHeader")
|
||||
}
|
||||
if mp.defValue != "" {
|
||||
options = append(options, fmt.Sprintf(`param.Default("%s")`, mp.defValue))
|
||||
if mp.defaultValue != "" {
|
||||
options = append(options, fmt.Sprintf(`param.Default("%s")`, mp.defaultValue))
|
||||
}
|
||||
if len(options) > 0 {
|
||||
result += ", "
|
||||
|
@ -28,10 +28,10 @@ var InBody MethodParamOption = func(p *MethodParam) {
|
||||
}
|
||||
|
||||
// Default provides a default value for the http param
|
||||
func Default(defValue interface{}) MethodParamOption {
|
||||
func Default(defaultValue interface{}) MethodParamOption {
|
||||
return func(p *MethodParam) {
|
||||
if defValue != nil {
|
||||
p.defValue = fmt.Sprint(defValue)
|
||||
if defaultValue != nil {
|
||||
p.defaultValue = fmt.Sprint(defaultValue)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user