1
0
mirror of https://github.com/astaxie/beego.git synced 2025-07-10 02:30:18 +00:00

fix label == `` #4001

This commit is contained in:
qiantao
2020-06-01 15:06:33 +08:00
parent 4ffe26a1d2
commit 70733d9810
2 changed files with 34 additions and 3 deletions

View File

@ -273,10 +273,13 @@ func (v *Validation) apply(chk Validator, obj interface{}) *Result {
Field = parts[0]
Name = parts[1]
Label = parts[2]
if len(Label) == 0 {
Label = Field
}
}
err := &Error{
Message: Label + chk.DefaultMessage(),
Message: Label + " " + chk.DefaultMessage(),
Key: key,
Name: Name,
Field: Field,
@ -293,19 +296,25 @@ func (v *Validation) apply(chk Validator, obj interface{}) *Result {
}
}
// key must like aa.bb.cc or aa.bb.
// AddError adds independent error message for the provided key
func (v *Validation) AddError(key, message string) {
Name := key
Field := ""
Label := ""
parts := strings.Split(key, ".")
if len(parts) == 3 {
Field = parts[0]
Name = parts[1]
Label = parts[2]
if len(Label) == 0 {
Label = Field
}
}
err := &Error{
Message: message,
Message: Label + " " + message,
Key: key,
Name: Name,
Field: Field,
@ -381,7 +390,6 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) {
}
}
chk := Required{""}.IsSatisfied(currentField)
if !hasRequired && v.RequiredFirst && !chk {
if _, ok := CanSkipFuncs[vf.Name]; ok {