Commit c7d6ad95 authored by Eliot Berriot's avatar Eliot Berriot

Merge branch 'release/0.3.5'

parents 440c04b5 b5ba6d62
......@@ -6,6 +6,12 @@ Changelog
------------------
0.3.5 (2018-01-07)
------------------
- Smarter BACKEND_URL in frontend
0.3.4 (2018-01-07)
------------------
......
# -*- coding: utf-8 -*-
__version__ = '0.3.4'
__version__ = '0.3.5'
__version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])
......@@ -112,9 +112,8 @@ 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: backendUrl + f.autocomplete + '?' + f.autocomplete_qs,
url: config.BACKEND_URL + f.autocomplete + '?' + f.autocomplete_qs,
beforeXHR: function (xhrObject) {
xhrObject.setRequestHeader('Authorization', self.$store.getters['auth/header'])
return xhrObject
......
class Config {
constructor () {
this.BACKEND_URL = process.env.BACKEND_URL
if (this.BACKEND_URL === '/') {
this.BACKEND_URL = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port
}
if (!this.BACKEND_URL.endsWith('/')) {
this.BACKEND_URL += '/'
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment