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

feat(relative time override): You can now use the new relative time option in panel time override, closes #2575

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-21 16:19:51 +02:00
parent 6d3b36d61b
commit 292db86c9e
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/app/panels/timepicker/module.js
View File

@@ -74,17 +74,7 @@ function (angular, app, _, moment, kbn) {
$scope.loadTimeOptions = function() {
$scope.time_options = _.map($scope.panel.time_options, function(str) {
var option = {value: str};
if (str === 'today') {
option.text = 'Today';
option.from = 'today';
option.to = 'now';
} else {
option.text = 'Last ' + str;
option.from = 'now-'+str;
option.to = 'now';
}
return option;
return kbn.getRelativeTimeInfo(str);
});
$scope.refreshMenuLeftSide = $scope.time.rangeString.length < 10;