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

Closes #123, you can now specify template (ie filter) values in url. ?fillterName=filterValue

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-02-23 19:34:01 +01:00
parent 3f2c69aea3
commit 75683c423d
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/services/filterSrv.js
View File

@@ -8,7 +8,7 @@ define([
var module = angular.module('kibana.services');
module.service('filterSrv', function(dashboard, $rootScope, $timeout) {
module.service('filterSrv', function(dashboard, $rootScope, $timeout, $routeParams) {
// defaults
var _d = {
list: [],
@@ -26,16 +26,38 @@ define([
self.list = dashboard.current.services.filter.list;
self.time = dashboard.current.services.filter.time;
self.filterTemplateData = undefined;
self.templateSettings = {
interpolate : /\[\[([\s\S]+?)\]\]/g,
};
if (self.list.length) {
this.updateTemplateData(true);
}
};
this.updateTemplateData = function(initial) {
self.filterTemplateData = {};
_.each(self.list, function(filter) {
if (initial) {
var urlValue = $routeParams[filter.name];
if (urlValue) {
filter.current = { text: urlValue, value: urlValue };
}
}
if (!filter.current || !filter.current.value) {
return;
}
self.filterTemplateData[filter.name] = filter.current.value;
});
}
this.filterOptionSelected = function(filter, option) {
filter.current = option;
self.filterTemplateData = undefined;
this.updateTemplateData();
dashboard.refresh();
};
@@ -47,16 +69,6 @@ define([
if (target.indexOf('[[') === -1) {
return target;
}
if (!self.filterTemplateData) {
self.filterTemplateData = {};
_.each(self.list, function(filter) {
if (!filter.current || !filter.current.value) {
return;
}
self.filterTemplateData[filter.name] = filter.current.value;
});
}
return _.template(target, self.filterTemplateData, self.templateSettings);
};

2
src/index.html
View File

@@ -21,7 +21,7 @@
</head>
<body ng-cloak body-class >
<body ng-cloak body-class>
<!--<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">-->
<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">