IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

/api/login/ping Fix for issue when behind reverse proxy and subpath, Fixes #1857

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-23 08:24:30 +02:00
parent 9f6a348851
commit 2c52224013
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
# 2.0.3 (unreleased)
**Fixes**
- [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath
# 2.0.2 (2015-04-22) # 2.0.2 (2015-04-22)
**Fixes** **Fixes**

2
package.json
View File

@ -4,7 +4,7 @@
"company": "Coding Instinct AB" "company": "Coding Instinct AB"
}, },
"name": "grafana", "name": "grafana",
"version": "2.0.2", "version": "2.0.3-pre1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "http://github.com/torkelo/grafana.git" "url": "http://github.com/torkelo/grafana.git"

3
public/app/services/backendSrv.js
View File

@ -63,8 +63,9 @@ function (angular, _, config) {
var requestIsLocal = options.url.indexOf('/') === 0; var requestIsLocal = options.url.indexOf('/') === 0;
var firstAttempt = options.retry === 0; var firstAttempt = options.retry === 0;
if (requestIsLocal && firstAttempt) { if (requestIsLocal && !options.hasSubUrl) {
options.url = config.appSubUrl + options.url; options.url = config.appSubUrl + options.url;
options.hasSubUrl = true;
} }
return $http(options).then(function(results) { return $http(options).then(function(results) {