lbsadmin
/
Beego
mirror of https://github.com/astaxie/beego.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'master' into develop

This commit is contained in:
astaxie 2017-10-14 17:53:40 +08:00
parent 520753415f c5118e9535
commit c56704f3fd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context/param/options.go
View File

@ -7,7 +7,7 @@ import (
// MethodParamOption defines a func which apply options on a MethodParam // MethodParamOption defines a func which apply options on a MethodParam
type MethodParamOption func(*MethodParam) type MethodParamOption func(*MethodParam)
// IsRequired indicates that this param is required and can not be ommited from the http request // IsRequired indicates that this param is required and can not be omitted from the http request
var IsRequired MethodParamOption = func(p *MethodParam) { var IsRequired MethodParamOption = func(p *MethodParam) {
p.required = true p.required = true
} }

2
context/param/parsers_test.go
View File

@ -75,7 +75,7 @@ func checkParser(def testDefinition, t *testing.T, methodParam ...MethodParam) {
} }
convResult, err := safeConvert(reflect.ValueOf(result), toType) convResult, err := safeConvert(reflect.ValueOf(result), toType)
if err != nil { if err != nil {
t.Errorf("Convertion error for %v. from value: %v, toType: %v, error: %v", def.strValue, result, toType, err) t.Errorf("Conversion error for %v. from value: %v, toType: %v, error: %v", def.strValue, result, toType, err)
return return
} }
if !reflect.DeepEqual(convResult.Interface(), def.expectedValue) { if !reflect.DeepEqual(convResult.Interface(), def.expectedValue) {

2
parser.go
View File

@ -227,7 +227,7 @@ func parseComment(lines []*ast.Comment) (pc *parsedComment, err error) {
} }
// direct copy from bee\g_docs.go // direct copy from bee\g_docs.go
// analisys params return []string // analysis params return []string
// @Param query form string true "The email for login" // @Param query form string true "The email for login"
// [query form string true "The email for login"] // [query form string true "The email for login"]
func getparams(str string) []string { func getparams(str string) []string {