From bd43fcee92d2871bd32386b5c0a9c68076fa59d3 Mon Sep 17 00:00:00 2001 From: Wim Brand Date: Tue, 11 Sep 2018 21:53:07 +0200 Subject: [PATCH] small api url fix --- webcontroller/fileViewer.go | 5 +++-- webcontroller/listViewer.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/webcontroller/fileViewer.go b/webcontroller/fileViewer.go index b53ba44..f4425de 100644 --- a/webcontroller/fileViewer.go +++ b/webcontroller/fileViewer.go @@ -2,6 +2,7 @@ package webcontroller import ( "fmt" + "html/template" "net/http" "strings" @@ -56,7 +57,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request, "APIResponse": listdata, "Type": "list", "OGData": ogData.FromFile(*finfo[0]), - "APIEndpoint": wc.conf.APIURLExternal, + "APIEndpoint": template.URL(wc.conf.APIURLExternal), }) } else { err = wc.templates.Get().ExecuteTemplate(w, "file_viewer", map[string]interface{}{ @@ -64,7 +65,7 @@ func (wc *WebController) serveFileViewer(w http.ResponseWriter, r *http.Request, "APIResponse": finfo[0], "Type": "file", "OGData": ogData.FromFile(*finfo[0]), - "APIEndpoint": wc.conf.APIURLExternal, + "APIEndpoint": template.URL(wc.conf.APIURLExternal), }) } if err != nil { diff --git a/webcontroller/listViewer.go b/webcontroller/listViewer.go index 456b981..643a4ec 100644 --- a/webcontroller/listViewer.go +++ b/webcontroller/listViewer.go @@ -2,6 +2,7 @@ package webcontroller import ( "fmt" + "html/template" "net/http" "fornaxian.com/pixeldrain-web/pixelapi" @@ -35,7 +36,7 @@ func (wc *WebController) serveListViewer(w http.ResponseWriter, r *http.Request, "APIResponse": listdata, "Type": "list", "OGData": ogData.FromList(*list), - "APIEndpoint": wc.conf.APIURLExternal, + "APIEndpoint": template.URL(wc.conf.APIURLExternal), }) if err != nil { log.Error("Error executing template file_viewer: %s", err)