From abb277210ce4c09174023f109b7cccff50159c56 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Mon, 21 Nov 2022 14:56:32 +0100
Subject: [PATCH] admin: Fix file download from admin interface

---
 admin/app.go                     | 6 ++++++
 admin/static/views/exercice.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/admin/app.go b/admin/app.go
index 0352cf2b..b7691dec 100644
--- a/admin/app.go
+++ b/admin/app.go
@@ -4,6 +4,8 @@ import (
 	"context"
 	"log"
 	"net/http"
+	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -33,6 +35,10 @@ func NewApp(cfg *settings.Settings, baseURL string, bind string) App {
 		router.GET("/", func(c *gin.Context) {
 			c.Redirect(http.StatusFound, baseURL)
 		})
+		router.GET(filepath.Dir(baseURL)+"/files/*_", func(c *gin.Context) {
+			path := c.Request.URL.Path
+			c.Redirect(http.StatusFound, filepath.Join(baseURL, strings.TrimPrefix(path, filepath.Dir(baseURL))))
+		})
 
 		baserouter = router.Group(baseURL)
 
diff --git a/admin/static/views/exercice.html b/admin/static/views/exercice.html
index dd38fac2..7b80e71a 100644
--- a/admin/static/views/exercice.html
+++ b/admin/static/views/exercice.html
@@ -96,7 +96,7 @@
 	  <form ng-submit="saveFile()" class="list-group-item bg-light text-dark" ng-repeat="file in files">
 	    <div class="row form-group">
 	      <input type="text" ng-model="file.name" class="col form-control form-control-sm" placeholder="Nom de fichier">
-	      <a href="/files{{file.path}}" class="btn btn-sm btn-secondary col-auto"><span class="glyphicon glyphicon-download" aria-hidden="true"></span></a>
+	      <a href="../files{{file.path}}" class="btn btn-sm btn-secondary col-auto"><span class="glyphicon glyphicon-download" aria-hidden="true"></span></a>
 	      <button type="submit" class="btn btn-sm btn-success col-auto"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span></button><br>
 	      <button type="button" ng-click="deleteFile()" class="btn btn-sm btn-danger col-auto"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></button>
 	    </div>