From dc46748ce32e3890f4a463c17fbc6b3b8544b3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kurk=C3=B3=20Mih=C3=A1ly?= <mail@mail>
Date: Mon, 8 Jan 2018 17:23:04 +0200
Subject: [PATCH] dashboard: resolve asset path

---
 dashboard/dashboard.go | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/dashboard/dashboard.go b/dashboard/dashboard.go
index 7ff2ff4d7d..2344cdb04a 100644
--- a/dashboard/dashboard.go
+++ b/dashboard/dashboard.go
@@ -18,15 +18,9 @@ package dashboard
 
 //go:generate npm --prefix ./assets install
 //go:generate ./assets/node_modules/.bin/webpack --config ./assets/webpack.config.js --context ./assets
-<<<<<<< HEAD
-//go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/public/...
+//go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/dashboard.html assets/bundle.js
 //go:generate sh -c "sed 's#var _public#//nolint:misspell\\\n&#' assets.go > assets.go.tmp && mv assets.go.tmp assets.go"
 //go:generate gofmt -w -s assets.go
-=======
-//go:generate go-bindata -nometadata -o assets.go -prefix assets -nocompress -pkg dashboard assets/dashboard.html assets/bundle.js
-//go:generate gofmt -s -w assets.go
-//go:generate sed -i "s#var _public#//nolint:misspell\\n&#" assets.go
->>>>>>> dashboard: footer, deep state update
 
 import (
 	"fmt"
@@ -169,7 +163,7 @@ func (db *Dashboard) webHandler(w http.ResponseWriter, r *http.Request) {
 		w.Write(blob)
 		return
 	}
-	blob, err := Asset(path)
+	blob, err := Asset(path[1:])
 	if err != nil {
 		log.Warn("Failed to load the asset", "path", path, "err", err)
 		http.Error(w, "not found", http.StatusNotFound)