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 #264

Browse Source
This commit is contained in:
Rashid Khan 2013-07-24 15:31:04 -07:00
parent 0723ad57b7
commit 05b15c4605
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
panels/timepicker/module.js
View File

@ -75,7 +75,13 @@ angular.module('kibana.timepicker', [])
// These 3 statements basicly do everything time_apply() does
set_timepicker($scope.time.from,$scope.time.to);
update_panel();
set_time_filter($scope.time);
// If we're in a mode where something must be calculated, clear existing filters
// and set new ones
if($scope.panel.mode !== 'absolute') {
set_time_filter($scope.time);
}
dashboard.refresh();
@ -224,15 +230,9 @@ angular.module('kibana.timepicker', [])
function set_time_filter(time) {
time.type = 'time';
// Check if there's a time filter we remember, if not, set one and remember it
if(!_.isUndefined($scope.panel.filter_id) &&
!_.isUndefined(filterSrv.list[$scope.panel.filter_id]) &&
filterSrv.list[$scope.panel.filter_id].type === 'time')
{
filterSrv.set(compile_time(time),$scope.panel.filter_id);
} else {
$scope.panel.filter_id = filterSrv.set(compile_time(time));
}
// Clear all time filters, set a new one
filterSrv.removeByType('time');
$scope.panel.filter_id = filterSrv.set(compile_time(time));
return $scope.panel.filter_id;
}