Skip to content

Commit 3cae0d5

Browse files
Fix asset file serving (#9295)
- Backport of #9292
1 parent 21d266a commit 3cae0d5

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

src/backend/InvenTree/web/tests.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ def test_get_frontend_settings(self):
8787
self.assertNotIn('show_server_selector', rsp)
8888
self.assertEqual(rsp['server_list'], ['aa', 'bb'])
8989

90-
def test_redirects(self):
91-
"""Test the redirect helper."""
92-
response = self.client.get('/assets/testpath')
93-
self.assertEqual(response.url, '/static/web/assets/testpath')
94-
9590

9691
class TestWebHelpers(InvenTreeAPITestCase):
9792
"""Tests for the web helpers."""

src/backend/InvenTree/web/urls.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from django.conf import settings
44
from django.http import JsonResponse
5-
from django.shortcuts import redirect
65
from django.urls import include, path, re_path
76
from django.views.decorators.csrf import ensure_csrf_cookie
87
from django.views.generic import TemplateView
@@ -12,16 +11,6 @@
1211
from InvenTree.mixins import RetrieveUpdateAPI
1312

1413

15-
class RedirectAssetView(TemplateView):
16-
"""View to redirect to static asset."""
17-
18-
def get(self, request, *args, **kwargs):
19-
"""Redirect to static asset."""
20-
return redirect(
21-
f'{settings.STATIC_URL}web/assets/{kwargs["path"]}', permanent=True
22-
)
23-
24-
2514
class PreferredSerializer(serializers.Serializer):
2615
"""Serializer for the preferred serializer session setting."""
2716

@@ -72,14 +61,12 @@ def update(self, request, *args, **kwargs):
7261

7362

7463
spa_view = ensure_csrf_cookie(TemplateView.as_view(template_name='web/index.html'))
75-
assets_path = path('assets/<path:path>', RedirectAssetView.as_view())
7664

7765

7866
urlpatterns = [
7967
path(
8068
f'{settings.FRONTEND_URL_BASE}/',
8169
include([
82-
assets_path,
8370
path(
8471
'set-password?uid=<uid>&token=<token>',
8572
spa_view,
@@ -88,7 +75,6 @@ def update(self, request, *args, **kwargs):
8875
re_path('.*', spa_view),
8976
]),
9077
),
91-
assets_path,
9278
path(settings.FRONTEND_URL_BASE, spa_view, name='platform'),
9379
]
9480

src/frontend/vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export default defineConfig({
4848
uploadToken: process.env.CODECOV_TOKEN
4949
})
5050
],
51+
base: '',
5152
build: {
5253
manifest: true,
5354
outDir: '../../src/backend/InvenTree/web/static/web',

0 commit comments

Comments
 (0)