From 04ae5c8648b10fbec5df400a090da2b10c6f8129 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 7 Jan 2018 22:49:20 +0100 Subject: [PATCH 1/3] Fixed wrong URL construction in ajax call --- CHANGELOG | 6 +++++- front/src/components/library/radios/Filter.vue | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1f4d8ff06..8127de117 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,10 +2,14 @@ Changelog ========= -0.3.4 (Unreleased) +0.3.6 (Unreleased) ------------------ +0.3.5 (2018-01-07) +------------------ + +- Fixed wrong URL construction in ajax call 0.3.4 (2018-01-07) diff --git a/front/src/components/library/radios/Filter.vue b/front/src/components/library/radios/Filter.vue index dd170d8b3..7ed5aa494 100644 --- a/front/src/components/library/radios/Filter.vue +++ b/front/src/components/library/radios/Filter.vue @@ -112,8 +112,9 @@ export default { selector.push('.autocomplete') settings.fields = f.autocomplete_fields settings.minCharacters = 1 + let backendUrl = config.BACKEND_URL || window.location.protocol + '//' + window.location.hostname + ':' + window.location.port settings.apiSettings = { - url: config.BACKEND_URL + f.autocomplete + '?' + f.autocomplete_qs, + url: backendUrl + f.autocomplete + '?' + f.autocomplete_qs, beforeXHR: function (xhrObject) { xhrObject.setRequestHeader('Authorization', self.$store.getters['auth/header']) return xhrObject From 7ab10d0742933167b59099a58583333f99e5a815 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 7 Jan 2018 22:51:08 +0100 Subject: [PATCH 2/3] Fixed broken changelog --- CHANGELOG | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8127de117..079e3eb4c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,17 +2,17 @@ Changelog ========= -0.3.6 (Unreleased) +0.3.5 (Unreleased) ------------------ -0.3.5 (2018-01-07) +0.3.4 (2018-01-07) ------------------ - Fixed wrong URL construction in ajax call -0.3.4 (2018-01-07) +0.3.3 (2018-01-07) ------------------ - Users can now create their own dynamic radios (#51) From 83f3fdddbbb79717b8aea1fa7318e324c14e1d9d Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sun, 7 Jan 2018 22:51:44 +0100 Subject: [PATCH 3/3] Version bump and changelog --- api/funkwhale_api/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index dda944964..7efdd7ff9 100644 --- a/api/funkwhale_api/__init__.py +++ b/api/funkwhale_api/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.3.3' +__version__ = '0.3.4' __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])