From 556b1b3718fec64327cf40c73ff55f8a41a3f2df Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Mon, 13 Nov 2017 00:56:13 +0100 Subject: [PATCH 1/3] fixed giving wrong parameter as url when creating request --- waitlist/utility/swagger/patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waitlist/utility/swagger/patch.py b/waitlist/utility/swagger/patch.py index 190553d7..501dbc6d 100644 --- a/waitlist/utility/swagger/patch.py +++ b/waitlist/utility/swagger/patch.py @@ -112,7 +112,7 @@ def request(self, req_and_resp, raw_body_only=None, opt=None): prepared_request = self._session.prepare_request( Request( method=request.method.upper(), - url=request, + url=request.url, params=request.query, data=request.data, headers=request.header From 72903f2bdf730f4be5f7e7b39cfbe7e1b38ddd13 Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Mon, 13 Nov 2017 00:56:35 +0100 Subject: [PATCH 2/3] fixed trying to access inaccessable variable when processing sse requests --- static/js/sse-dom.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/static/js/sse-dom.js b/static/js/sse-dom.js index 7c4eb5ec..cf9e5bee 100644 --- a/static/js/sse-dom.js +++ b/static/js/sse-dom.js @@ -5,6 +5,7 @@ if (!waitlist) { } waitlist.sse_dom = (function () { + let getMetaData = waitlist.base.getMetaData; let loadWaitlist = waitlist.listdom.loadWaitlist; let addFitToDom = waitlist.listdom.addFitToDom; let addNewEntry = waitlist.listdom.addNewEntry; @@ -15,6 +16,8 @@ waitlist.sse_dom = (function () { let clearWaitlists = waitlist.listdom.clearWaitlists; let sse = waitlist.sse; + let settings = {}; + function fitAddedListener(event) { let data = JSON.parse(event.data); addFitToDom(data.listId, data.entryId, data.fit, data.isQueue, data.userId); @@ -93,6 +96,7 @@ waitlist.sse_dom = (function () { function init() { loadWaitlist(); + settings.can_manage = getMetaData('can-fleetcomp') === "True"; } $(document).ready(init); From 49105ab02ad3082da38d37c5572633274810b87d Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Mon, 13 Nov 2017 01:03:26 +0100 Subject: [PATCH 3/3] version change to 1.1.3 and changelog update --- CHANGELOG.md | 4 ++++ waitlist/data/version.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7d98a38..bfd75d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ #Changelog +* 1.1.3 + * Fixes + * Fixed error in handling sse requests + * Fixed error when generating ESI requests * 1.1.2 * Fixes * Fixed broken html that made the page not work correctly in some browser diff --git a/waitlist/data/version.py b/waitlist/data/version.py index 9ce5d7ee..34c05dc0 100644 --- a/waitlist/data/version.py +++ b/waitlist/data/version.py @@ -1 +1 @@ -version = "1.1.2-$Format:%h$" +version = "1.1.3-$Format:%h$"