diff --git a/modules/templates/helper.go b/modules/templates/helper.go index 8779de69c..330cbf890 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -239,7 +239,7 @@ func DotEscape(raw string) string { // Iif is an "inline-if", similar util.Iif[T] but templates need the non-generic version, // and it could be simply used as "{{Iif expr trueVal}}" (omit the falseVal). func Iif(condition any, vals ...any) any { - if IsTruthy(condition) { + if isTemplateTruthy(condition) { return vals[0] } else if len(vals) > 1 { return vals[1] @@ -247,7 +247,7 @@ func Iif(condition any, vals ...any) any { return nil } -func IsTruthy(v any) bool { +func isTemplateTruthy(v any) bool { if v == nil { return false } @@ -256,20 +256,20 @@ func IsTruthy(v any) bool { switch rv.Kind() { case reflect.Bool: return rv.Bool() - case reflect.String: - return rv.String() != "" case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: return rv.Int() != 0 case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: return rv.Uint() != 0 case reflect.Float32, reflect.Float64: return rv.Float() != 0 - case reflect.Slice, reflect.Array, reflect.Map: + case reflect.Complex64, reflect.Complex128: + return rv.Complex() != 0 + case reflect.String, reflect.Slice, reflect.Array, reflect.Map: return rv.Len() > 0 - case reflect.Ptr: - return !rv.IsNil() && IsTruthy(reflect.Indirect(rv).Interface()) + case reflect.Struct: + return true default: - return rv.Kind() == reflect.Struct && !rv.IsNil() + return !rv.IsNil() } } diff --git a/modules/templates/helper_test.go b/modules/templates/helper_test.go index c6c70cc18..ea5da7be8 100644 --- a/modules/templates/helper_test.go +++ b/modules/templates/helper_test.go @@ -5,8 +5,11 @@ package templates import ( "html/template" + "strings" "testing" + "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) @@ -66,17 +69,40 @@ func TestSanitizeHTML(t *testing.T) { assert.Equal(t, template.HTML(`link xss