Merge branch 'release/1.1.3'

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

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);

waitlist/data/version.py

@@ -1 +1 @@
-version = "1.1.2-$Format:%h$"
+version = "1.1.3-$Format:%h$"

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