tpl: Update Jsonify to return pretty-print output

Fixes #5040

diff --git a/docs/content/en/functions/jsonify.md b/docs/content/en/functions/jsonify.md
index 5c670244f276e97cffec9c2b84ade8f308d4010f..98ad3c78baf2c5eeecb5be6f4ed68171edb1fe09 100644 (file)
--- a/docs/content/en/functions/jsonify.md
+++ b/docs/content/en/functions/jsonify.md
@@ -1,7 +1,7 @@
 ---
 title: jsonify
 linktitle: jsonify
-description: Encodes a given object to JSON.
+description: Encodes a given object to JSON, returning pretty printed output.
 godocref:
 date: 2017-02-01
 publishdate: 2017-02-01

diff --git a/tpl/encoding/encoding.go b/tpl/encoding/encoding.go
index 4b02c426a93dd6752f68988e0c27f28732c91a01..d9c2bdfd64d0307920763b344fe94adde2e1ae07 100644 (file)
--- a/tpl/encoding/encoding.go
+++ b/tpl/encoding/encoding.go
@@ -50,9 +50,9 @@ func (ns *Namespace) Base64Encode(content interface{}) (string, error) {
        return base64.StdEncoding.EncodeToString([]byte(conv)), nil
 }
 
-// Jsonify encodes a given object to JSON.
+// Jsonify encodes a given object to JSON, returning pretty printed output.
 func (ns *Namespace) Jsonify(v interface{}) (template.HTML, error) {
-       b, err := json.Marshal(v)
+       b, err := json.MarshalIndent(v, "", "  ")
        if err != nil {
                return "", err
        }

diff --git a/tpl/encoding/encoding_test.go b/tpl/encoding/encoding_test.go
index 8242561b656a967710978fb5c7d238790c92daf0..fdb12e349d45804fb8c6612d945f376fa79e4905 100644 (file)
--- a/tpl/encoding/encoding_test.go
+++ b/tpl/encoding/encoding_test.go
@@ -88,7 +88,7 @@ func TestJsonify(t *testing.T) {
                v      interface{}
                expect interface{}
        }{
-               {[]string{"a", "b"}, template.HTML(`["a","b"]`)},
+               {[]string{"a", "b"}, template.HTML("[\n  \"a\",\n  \"b\"\n]")},
                {tstNoStringer{}, template.HTML("{}")},
                {nil, template.HTML("null")},
                // errors

diff --git a/tpl/encoding/init.go b/tpl/encoding/init.go
index bad1804de8fcddc834d21912218e3202b46f76a3..902a2b0030c8ec790c2f935c44cf8eba3c28ed03 100644 (file)
--- a/tpl/encoding/init.go
+++ b/tpl/encoding/init.go
@@ -47,7 +47,7 @@ func init() {
                ns.AddMethodMapping(ctx.Jsonify,
                        []string{"jsonify"},
                        [][2]string{
-                               {`{{ (slice "A" "B" "C") | jsonify }}`, `["A","B","C"]`},
+                               {`{{ (slice "A" "B" "C") | jsonify }}`, "[\n  \"A\",\n  \"B\",\n  \"C\"\n]"},
                        },
                )