server/beego
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
letu 2021-05-14 22:57:57 +08:00
commit 402531d68a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/web/templatefunc.go
View File

@ -618,7 +618,10 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
default: default:
return false, errBadComparison return false, errBadComparison
} }
} else { if truth {
return true, nil
}
}
switch k1 { switch k1 {
case boolKind: case boolKind:
truth = v1.Bool() == v2.Bool() truth = v1.Bool() == v2.Bool()
@ -633,8 +636,7 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
case uintKind: case uintKind:
truth = v1.Uint() == v2.Uint() truth = v1.Uint() == v2.Uint()
default: default:
panic("invalid kind") return false, errBadComparisonType
}
} }
if truth { if truth {
return true, nil return true, nil