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

2021-05-14 22:57:57 +08:00 · 2021-05-14 22:57:57 +08:00 · 402531d68a
commit 402531d68a
parent 27f7095eec f4d4591962
1 changed files with 18 additions and 16 deletions
--- a/server/web/templatefunc.go
+++ b/server/web/templatefunc.go
@ -618,7 +618,10 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
 			default:
 				return false, errBadComparison
 			}
-		} else {
+			if truth {
+				return true, nil
+			}
+		}
 		switch k1 {
 		case boolKind:
 			truth = v1.Bool() == v2.Bool()
@ -633,8 +636,7 @@ func eq(arg1 interface{}, arg2 ...interface{}) (bool, error) {
 		case uintKind:
 			truth = v1.Uint() == v2.Uint()
 		default:
-				panic("invalid kind")
-			}
+			return false, errBadComparisonType
 		}
 		if truth {
 			return true, nil