Upgrade to Bulma 1.0.2.
This commit is contained in:
parent
3eab2f5562
commit
acbc5e4bf6
7 changed files with 21 additions and 43 deletions
|
|
@ -3,7 +3,6 @@ package funcmap
|
|||
import (
|
||||
"fmt"
|
||||
"html/template"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"github.com/Masterminds/sprig"
|
||||
|
|
@ -29,7 +28,6 @@ func NewFuncMap(web *echo.Echo) template.FuncMap {
|
|||
funcs := sprig.FuncMap()
|
||||
|
||||
// Include all the custom functions
|
||||
funcs["hasField"] = fm.hasField
|
||||
funcs["file"] = fm.file
|
||||
funcs["link"] = fm.link
|
||||
funcs["url"] = fm.url
|
||||
|
|
@ -37,18 +35,6 @@ func NewFuncMap(web *echo.Echo) template.FuncMap {
|
|||
return funcs
|
||||
}
|
||||
|
||||
// hasField checks if an interface contains a given field
|
||||
func (fm *funcMap) hasField(v any, name string) bool {
|
||||
rv := reflect.ValueOf(v)
|
||||
if rv.Kind() == reflect.Ptr {
|
||||
rv = rv.Elem()
|
||||
}
|
||||
if rv.Kind() != reflect.Struct {
|
||||
return false
|
||||
}
|
||||
return rv.FieldByName(name).IsValid()
|
||||
}
|
||||
|
||||
// file appends a cache buster to a given filepath so it can remain cached until the app is restarted
|
||||
func (fm *funcMap) file(filepath string) string {
|
||||
return fmt.Sprintf("/%s/%s?v=%s", config.StaticPrefix, filepath, CacheBuster)
|
||||
|
|
|
|||
|
|
@ -12,22 +12,11 @@ import (
|
|||
|
||||
func TestNewFuncMap(t *testing.T) {
|
||||
f := NewFuncMap(echo.New())
|
||||
assert.NotNil(t, f["hasField"])
|
||||
assert.NotNil(t, f["link"])
|
||||
assert.NotNil(t, f["file"])
|
||||
assert.NotNil(t, f["url"])
|
||||
}
|
||||
|
||||
func TestHasField(t *testing.T) {
|
||||
type example struct {
|
||||
name string
|
||||
}
|
||||
var e example
|
||||
f := new(funcMap)
|
||||
assert.True(t, f.hasField(e, "name"))
|
||||
assert.False(t, f.hasField(e, "abcd"))
|
||||
}
|
||||
|
||||
func TestLink(t *testing.T) {
|
||||
f := new(funcMap)
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@ func (h *Files) Page(ctx echo.Context) error {
|
|||
func (h *Files) Submit(ctx echo.Context) error {
|
||||
file, err := ctx.FormFile("file")
|
||||
if err != nil {
|
||||
return err
|
||||
msg.Danger(ctx, "A file is required.")
|
||||
return h.Page(ctx)
|
||||
}
|
||||
|
||||
src, err := file.Open()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue