Commit 2c522240 by Torkel Ödegaard

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

parent 9f6a3488
# 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**
......
...@@ -4,7 +4,7 @@ ...@@ -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"
......
...@@ -63,8 +63,9 @@ function (angular, _, config) { ...@@ -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) {
......
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