phoenix/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-07-02 15:20:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

tpl: Treat booleans as set in default function

Browse source 
Booleans and `default` don't really make sense together, so we'll always treat
booleans as "set" and return the given value.
This commit is contained in:
Cameron Moore 2016-03-16 12:45:50 -05:00 committed by Bjørn Erik Pedersen
parent b5c718a4de
commit b0326a1c0f
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/content/templates/functions.md
View file

@ -30,9 +30,9 @@ and other basic tools; these are listed in the
### default
Checks whether a given value is set and returns a default value if it is not.
"Set" in this context means true for booleans; non-zero for numeric types and
times; non-zero length for strings, arrays, slices, and maps; any struct value;
or non-nil for any other types.
"Set" in this context means non-zero for numeric types and times;
non-zero length for strings, arrays, slices, and maps;
any boolean or struct value; or non-nil for any other types.
e.g.

8
tpl/template_funcs.go
View file

@ -1318,9 +1318,9 @@ func dateFormat(layout string, v interface{}) (string, error) {
}
// dfault checks whether a given value is set and returns a default value if it
// is not. "Set" in this context means true for booleans; non-zero for numeric
// types and times; non-zero length for strings, arrays, slices, and maps; any
// struct value; or non-nil for any other types.
// is not. "Set" in this context means non-zero for numeric types and times;
// non-zero length for strings, arrays, slices, and maps;
// any boolean or struct value; or non-nil for any other types.
func dfault(dflt interface{}, given ...interface{}) (interface{}, error) {
// given is variadic because the following construct will not pass a piped
// argument when the key is missing: {{ index . "key" | default "foo" }}
@ -1342,7 +1342,7 @@ func dfault(dflt interface{}, given ...interface{}) (interface{}, error) {
switch g.Kind() {
case reflect.Bool:
set = g.Bool()
set = true
case reflect.String, reflect.Array, reflect.Slice, reflect.Map:
set = g.Len() != 0
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:

1
tpl/template_funcs_test.go
View file

@ -1886,6 +1886,7 @@ func TestDefaultFunc(t *testing.T) {
given interface{}
expected interface{}
}{
{true, false, false},
{"5", 0, "5"},
{"test1", "set", "set"},