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

Widget: Fix possible redirect loop

Browse Source
This commit is contained in:
Raphael Michel
2021-03-16 17:26:09 +01:00
parent d6aeefdf09
commit 2792813d95
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pretix/static/pretixpresale/js/widget/widget.js
View File

@@ -1342,7 +1342,7 @@ var shared_root_methods = {
url += '&voucher=' + encodeURIComponent(this.$root.voucher_code); url += '&voucher=' + encodeURIComponent(this.$root.voucher_code);
} }
if (cart_id) { if (cart_id) {
url += "&cart_id=" + cart_id; url += "&cart_id=" + encodeURIComponent(cart_id);
} }
if (this.$root.date !== null) { if (this.$root.date !== null) {
url += "&year=" + this.$root.date.substr(0, 4) + "&month=" + this.$root.date.substr(5, 2); url += "&year=" + this.$root.date.substr(0, 4) + "&month=" + this.$root.date.substr(5, 2);
@@ -1350,18 +1350,21 @@ var shared_root_methods = {
url += "&year=" + this.$root.week[0] + "&week=" + this.$root.week[1]; url += "&year=" + this.$root.week[0] + "&week=" + this.$root.week[1];
} }
if (this.$root.style !== null) { if (this.$root.style !== null) {
url = url + '&style=' + this.$root.style; url = url + '&style=' + encodeURIComponent(this.$root.style);
} }
var root = this.$root; var root = this.$root;
api._getJSON(url, function (data, xhr) { api._getJSON(url, function (data, xhr) {
if (typeof xhr.responseURL !== "undefined" && xhr.responseURL !== url) { if (typeof xhr.responseURL !== "undefined") {
var new_url = xhr.responseURL.substr(0, xhr.responseURL.indexOf("/widget/product_list?") + 1); var new_url = xhr.responseURL.substr(0, xhr.responseURL.indexOf("/widget/product_list?") + 1);
if (root.subevent) { var old_url = url.substr(0, url.indexOf("/widget/product_list?") + 1);
new_url = new_url.substr(0, new_url.lastIndexOf("/", new_url.length - 1) + 1); if (new_url !== old_url) {
if (root.subevent) {
new_url = new_url.substr(0, new_url.lastIndexOf("/", new_url.length - 1) + 1);
}
root.target_url = new_url;
root.reload();
return;
} }
root.target_url = new_url;
root.reload();
return;
} }
if (data.weeks !== undefined) { if (data.weeks !== undefined) {
root.weeks = data.weeks; root.weeks = data.weeks;