From 005d36522cf41c0b5d6d5cc4ba922eb0dec6c6ff Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Fri, 8 Jun 2018 21:32:54 +0200 Subject: [PATCH 1/3] Fixed open ingame mail not working on feedback page (this was broken since the esipy upgrade) --- waitlist/utility/swagger/evemail.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/waitlist/utility/swagger/evemail.py b/waitlist/utility/swagger/evemail.py index 28ed4044..30671491 100644 --- a/waitlist/utility/swagger/evemail.py +++ b/waitlist/utility/swagger/evemail.py @@ -67,7 +67,8 @@ def open_mail(token: SSOToken, recipients: Sequence[int], body: str, subject: st payload['recipients'] = [0] client = get_esi_client(token, False) - response = client.request(client.security.app.op['post_ui_openwindow_newmail'](new_mail=payload)) + api: App = get_api() + response = client.request(api.op['post_ui_openwindow_newmail'](new_mail=payload)) if response.status == 204: return ESIResponse(get_expire_time(response), response.status, None) From 51236783753e7fcb3cd48547d44610bb33fa45e3 Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Fri, 8 Jun 2018 21:33:43 +0200 Subject: [PATCH 2/3] changed that eve-ui does no display fits only in english (this basically resits it to how it was in the past before ccps api started looking at Accept-Language header) --- static/js/eve-ui-config.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/static/js/eve-ui-config.js b/static/js/eve-ui-config.js index 634ffac2..aa3756ef 100644 --- a/static/js/eve-ui-config.js +++ b/static/js/eve-ui-config.js @@ -4,4 +4,12 @@ var eveui_imageserver = function(image_ref) { return eve_image(encodeURI(image_ref), 'jpg'); } return eve_image(encodeURI(image_ref), 'png'); -}; \ No newline at end of file +}; +// fix for getting names for modules from ccp api that are in the users browser language +$.ajaxSetup({ + beforeSend: function(xhr, settings) { + if (settings.url.includes('/universe/types/')) { + xhr.setRequestHeader('Accept-Language', 'en-us, en;q=0.9'); + } + } +}); From 1864bfbd1698c558f1b55fe58ce562e82913dea9 Mon Sep 17 00:00:00 2001 From: SpeedProg Date: Fri, 8 Jun 2018 21:38:39 +0200 Subject: [PATCH 3/3] updated version and changelog --- CHANGELOG.md | 7 +++++++ waitlist/data/version.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc31a004..573db752 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ #Changelog +* 1.3.2 + * Fixes + * Feedbacks open ingame mail button not working (this was broken with esipy upgrade in 1.3.0) + * Improvement + * Intercepting ajax calls to urls with /universe/types/ in url and setting Accept-Language header to'en-us, en;q=0.9' + to counter the change where ccp's esi started looking at that header for the name of modules + * 1.3.1 * Fixes * fixed for possible race contition between checking if a character exists in db and creating it diff --git a/waitlist/data/version.py b/waitlist/data/version.py index eac23a84..932b3826 100644 --- a/waitlist/data/version.py +++ b/waitlist/data/version.py @@ -1 +1 @@ -version = "1.3.1-$Format:%h$" +version = "1.3.2-$Format:%h$"