{{ in }} should work with html.Template type

Fixes #7002

diff --git a/tpl/collections/collections.go b/tpl/collections/collections.go
index 5b9d4a7009fb8eeecde9b2e94433582489af0a6d..80f4ccc078accfb62a09b2c1d2308747a0e22450 100644 (file)
--- a/tpl/collections/collections.go
+++ b/tpl/collections/collections.go
@@ -292,12 +292,17 @@ func (ns *Namespace) In(l interface{}, v interface{}) (bool, error) {
                                return true, nil
                        }
                }
-       case reflect.String:
-               if vv.Type() == lv.Type() && strings.Contains(lv.String(), vv.String()) {
-                       return true, nil
-               }
        }
-       return false, nil
+       ss, err := cast.ToStringE(l)
+       if err != nil {
+               return false, nil
+       }
+
+       su, err := cast.ToStringE(v)
+       if err != nil {
+               return false, nil
+       }
+       return strings.Contains(ss, su), nil
 }
 
 // Intersect returns the common elements in the given sets, l1 and l2.  l1 and

diff --git a/tpl/collections/collections_test.go b/tpl/collections/collections_test.go
index c98f4a527afa0200da31b2e8118b3f9aa67d78ae..24d3b051c88dd3bb6d85a2589f6fb9f404057068 100644 (file)
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -345,6 +345,9 @@ func TestIn(t *testing.T) {
                // Structs
                {pagesVals{p3v, p2v, p3v, p2v}, p2v, true},
                {pagesVals{p3v, p2v, p3v, p2v}, p4v, false},
+               // template.HTML
+               {template.HTML("this substring should be found"), "substring", true},
+               {template.HTML("this substring should not be found"), "subseastring", false},
        } {
 
                errMsg := qt.Commentf("[%d] %v", i, test)