CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

fix templatetag paths to match what's in the vite mantifest

Browse Source
This commit is contained in:
rash
2026-03-16 16:11:49 +01:00
parent 21bd00e7e6
commit 8fc2e78a58
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/base/templatetags/vite.py
View File

@@ -13,6 +13,7 @@ register = template.Library()
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
_MANIFEST = {} _MANIFEST = {}
MANIFEST_PATH = settings.STATIC_ROOT + "/vite/control/.vite/manifest.json" MANIFEST_PATH = settings.STATIC_ROOT + "/vite/control/.vite/manifest.json"
MANIFEST_BASE = "vite/control/"
# We're building the manifest if we don't have a dev server running AND if we're # We're building the manifest if we don't have a dev server running AND if we're
# not currently running `rebuild` (which creates the manifest in the first place). # not currently running `rebuild` (which creates the manifest in the first place).
@@ -46,7 +47,7 @@ def generate_css_tags(asset, already_processed=None):
if "css" in manifest_entry: if "css" in manifest_entry:
for css_path in manifest_entry["css"]: for css_path in manifest_entry["css"]:
if css_path not in already_processed: if css_path not in already_processed:
full_path = urljoin(settings.STATIC_URL, css_path) full_path = urljoin(settings.STATIC_URL, MANIFEST_BASE + css_path)
tags.append(f'<link rel="stylesheet" href="{full_path}" />') tags.append(f'<link rel="stylesheet" href="{full_path}" />')
already_processed.append(css_path) already_processed.append(css_path)
@@ -78,7 +79,7 @@ def vite_asset(path):
tags = generate_css_tags(path) tags = generate_css_tags(path)
tags.append( tags.append(
generate_script_tag( generate_script_tag(
manifest_entry["file"], {"type": "module", "crossorigin": ""} MANIFEST_BASE + manifest_entry["file"], {"type": "module", "crossorigin": ""}
) )
) )
return "".join(tags) return "".join(tags)

2
src/pretix/control/templates/pretixcontrol/checkin/list_edit.html
View File

@@ -104,5 +104,5 @@
<script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script> <script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script>
{% endcompress %} {% endcompress %}
{% vite_hmr %} {% vite_hmr %}
{% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/" %} {% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/index.ts" %}
{% endblock %} {% endblock %}

2
src/pretix/control/templates/pretixcontrol/checkin/simulator.html
View File

@@ -152,5 +152,5 @@
<script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script> <script type="text/javascript" src="{% static "d3/d3-zoom.v2.js" %}"></script>
{% endcompress %} {% endcompress %}
{% vite_hmr %} {% vite_hmr %}
{% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/" %} {% vite_asset "src/pretix/static/pretixcontrol/js/ui/checkinrules/index.ts" %}
{% endblock %} {% endblock %}