Refactoring pull request for basic auth improvement

This commit is contained in:
Torkel Ödegaard
2014-02-26 08:49:53 +01:00
parent bb64e812d8
commit d79dcb952d
2 changed files with 19 additions and 24 deletions

View File

@@ -14,17 +14,9 @@ function (angular, _, $, config, kbn, moment) {
module.factory('GraphiteDatasource', function(dashboard, $q, filterSrv, $http) {
function GraphiteDatasource(datasource) {
var passwordEnd = datasource.url.indexOf('@');
if(passwordEnd > 0) {
var userStart = datasource.url.indexOf('//') + 2;
var urlHead = datasource.url.substring(0,userStart);
this.url = urlHead + datasource.url.substring(passwordEnd);
}
else {
this.url = datasource.url;
}
this.type = 'graphite';
this.basicAuth = datasource.basicAuth;
this.url = datasource.url;
}
GraphiteDatasource.prototype.query = function(options) {