github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 09:48:58 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3976 from worldline/timeDefaults

Browse source 
use timeDefault from config
This commit is contained in:
Rashid Khan 2015-06-26 11:31:56 -07:00
commit 664813d978
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kibana/components/config/defaults.js
View file

@ -128,6 +128,14 @@ define(function () {
'format:currency:defaultPattern': {
type: 'string',
value: '($0,0.[00])'
},
'timepicker:timeDefaults': {
type: 'json',
value: JSON.stringify({
from: 'now-15m',
to: 'now',
mode: 'quick'
}, null, 2)
}
};
};

8
src/kibana/components/timefilter/timefilter.js
View file

@ -1,7 +1,7 @@
define(function (require) {
require('modules')
.get('kibana')
.service('timefilter', function (Private, globalState, $rootScope) {
.service('timefilter', function (Private, globalState, $rootScope, config) {
var _ = require('lodash');
var angular = require('angular');
@ -27,11 +27,7 @@
self.enabled = false;
var timeDefaults = {
from: 'now-15m',
to: 'now',
mode: 'quick'
};
var timeDefaults = config.get('timepicker:timeDefaults');
var refreshIntervalDefaults = {
display: 'Off',