Fix force_download view

usegalaxy-au · Jan 16, 2025 · b51dab8 · b51dab8
1 parent 7fa0e3e
commit b51dab8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/labs/views.py b/app/labs/views.py
@@ -115,13 +115,13 @@ def force_download(self, request, relpath: Path, fname=None):
             logger.debug('Serving file %s' % relpath)
             response = serve(
                 request,
-                os.path.basename(relpath),
-                os.path.dirname(settings.TEMP_DIR / relpath)
+                relpath,
+                settings.INTERNAL_ROOT,
             )
             response['Content-Disposition'] = "attachment; filename=%s" % fname
             return response
 
-        url = settings.INTERNAL_URL + str(relpath)
+        url = settings.INTERNAL_URL + str(relpath).strip('/')
         logger.debug('Serving file via Nginx X-Accel-Redirect: %s' % relpath)
         response = HttpResponse()
         response['Content-Type'] = ''