Commit 4bf8777c by Torkel Ödegaard

removed timefield from filters

parent 55467e26
......@@ -15,6 +15,7 @@ function (angular, _, config, graphiteFuncs, Parser) {
$scope.init = function() {
$scope.funcCategories = graphiteFuncs.getCategories();
parseTarget();
i = 10;
};
function parseTarget() {
......
<div>
<div class="row-fluid">
<div class="span12">
No options here
</div>
</div>
</div>
\ No newline at end of file
<div>
<style>
.input-query-alias {
margin-bottom: 5px !important;
}
</style>
<a class="close" ng-click="render();dismiss();" href="">×</a>
<h6>Query Alias</h6>
<form>
<input class="input-medium input-query-alias" type="text" ng-model="queries.list[id].alias" placeholder='Alias...' />
<div>
<i ng-repeat="color in queries.colors" class="pointer" ng-class="{'icon-circle-blank':queries.list[id].color == color,'icon-circle':queries.list[id].color != color}" style="color:{{color}}" ng-click="queries.list[id].color = color;render();"> </i>
</div>
</form>
</div>
\ No newline at end of file
......@@ -18,8 +18,7 @@ function (angular, app, _) {
$scope.panelMeta = {
status : "Stable",
description : "A controllable list of all filters currently applied to the dashboard. You "+
"almost certainly want one of these on your dashboard somewhere."
description : "graphite target filters"
};
// Set and populate defaults
......
......@@ -737,7 +737,6 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
type : 'time',
from : moment.utc(ranges.xaxis.from).toDate(),
to : moment.utc(ranges.xaxis.to).toDate(),
field : scope.panel.time_field
});
});
}
......
......@@ -153,7 +153,6 @@ function (angular, app, _, moment, kbn) {
// Create filter object
var _filter = {
type : 'time',
field : $scope.panel.timefield,
from : "now-"+timespan,
to: "now"
};
......
......@@ -139,6 +139,16 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
_.defaults(dashboard,_dash);
_.defaults(dashboard.index,_dash.index);
_.defaults(dashboard.loader,_dash.loader);
var filtering = _.findWhere(dashboard.pulldowns, {type: 'filtering'});
if (!filtering) {
dashboard.pulldowns.push({
type: 'filtering',
enable: false,
collapse: true
});
}
return dashboard;
};
......
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