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

Statistics: Prevent issues with async script loading

Browse Source
This commit is contained in:
Raphael Michel
2018-08-17 11:10:23 +02:00
parent 85952ce6b7
commit 10c7d9a6e1
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/control/templates/pretixcontrol/base.html
View File

@@ -14,7 +14,8 @@
<link rel="stylesheet" type="text/x-scss" href="{% static "pretixcontrol/scss/main.scss" %}" /> <link rel="stylesheet" type="text/x-scss" href="{% static "pretixcontrol/scss/main.scss" %}" />
{% endcompress %} {% endcompress %}
{% if DEBUG %} {% if DEBUG %}
<script type="text/javascript" src="{% url 'javascript-catalog' lang=request.LANGUAGE_CODE %}" async></script> <script type="text/javascript" src="{% url 'javascript-catalog' lang=request.LANGUAGE_CODE %}"
defer></script>
{% else %} {% else %}
<script src="{% statici18n LANGUAGE_CODE %}" async></script> <script src="{% statici18n LANGUAGE_CODE %}" async></script>
{% endif %} {% endif %}

8
src/pretix/plugins/statistics/static/pretixplugins/statistics/statistics.js
View File

@@ -1,4 +1,10 @@
/*globals $, Morris, gettext*/ /*globals $, Morris, gettext, django*/
function gettext(msgid) {
if (typeof django !== 'undefined' && typeof django.gettext !== 'undefined') {
return django.gettext(msgid);
}
return msgid;
}
$(function () { $(function () {
$(".chart").css("height", "250px"); $(".chart").css("height", "250px");
new Morris.Area({ new Morris.Area({

3
src/pretix/plugins/statistics/templates/pretixplugins/statistics/index.html
View File

@@ -63,7 +63,8 @@
<script type="application/json" id="rev-data">{{ rev_data|escapejson }}</script> <script type="application/json" id="rev-data">{{ rev_data|escapejson }}</script>
<script type="application/json" id="obp-data">{{ obp_data|escapejson }}</script> <script type="application/json" id="obp-data">{{ obp_data|escapejson }}</script>
<script type="application/text" id="currency">{{ request.event.currency }}</script> <script type="application/text" id="currency">{{ request.event.currency }}</script>
<script type="application/javascript" src="{% static "pretixplugins/statistics/statistics.js" %}"></script> <script type="application/javascript" src="{% static "pretixplugins/statistics/statistics.js" %}"
defer></script>
{% else %} {% else %}
<div class="empty-collection"> <div class="empty-collection">
<p> <p>