CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-functional login page after session timeout

Browse Source
This commit is contained in:
Raphael Michel
2023-03-21 17:17:39 +01:00
parent 464a25a678
commit 0121e053f6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/control/templates/pretixcontrol/auth/login.html
View File

@@ -46,4 +46,5 @@
{% endif %} {% endif %}
</div> </div>
</form> </form>
<!-- pretix-login-marker -->{# marker required for ajax calls to detect that user session is over #}
{% endblock %} {% endblock %}

4
src/pretix/static/pretixcontrol/js/ui/main.js
View File

@@ -100,7 +100,9 @@ var i18nToString = function (i18nstring) {
$(document).ajaxError(function (event, jqXHR, settings, thrownError) { $(document).ajaxError(function (event, jqXHR, settings, thrownError) {
waitingDialog.hide(); waitingDialog.hide();
var c = $(jqXHR.responseText).filter('.container'); var c = $(jqXHR.responseText).filter('.container');
if (c.length > 0) { if (jqXHR.responseText.indexOf("<!-- pretix-login-marker -->") !== -1) {
location.href = '/control/login?next=' + encodeURIComponent(location.pathname + location.search + location.hash)
} else if (c.length > 0) {
ajaxErrDialog.show(c.first().html()); ajaxErrDialog.show(c.first().html());
} else if (thrownError !== "abort" && thrownError !== "") { } else if (thrownError !== "abort" && thrownError !== "") {
console.log(thrownError); console.log(thrownError);